xielianghe

whepi-ui/templates/home/ribao.js

@@ -301,10 +301,10 @@ function ribao_init() {
   $("#switchQuezhen").select({
     title: "选择症状",
     items: [
-        {
-            title: "无",
-            value: "0",
-        },
+      {
+        title: "无",
+        value: "0",
+      },
       {
         title: "新冠确诊",
         value: "1",
@@ -419,12 +419,12 @@ function selectinput6(obj) {
   var grender = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
   if (grender == 0) {
     $('#none')[0].style.display = 'none';
-      $("#js_input_cfd").val("");
-      $("#js_input_cfd").attr("data-values", "");
-      $("#js_input_mdd").val("");
-      $("#js_input_mdd").attr("data-values", "");
-      $("#js_input_cxfs").val("");
-      $("#js_input_cxfs").attr("data-values", "");
+    $("#js_input_cfd").val("");
+    $("#js_input_cfd").attr("data-values", "");
+    $("#js_input_mdd").val("");
+    $("#js_input_mdd").attr("data-values", "");
+    $("#js_input_cxfs").val("");
+    $("#js_input_cxfs").attr("data-values", "");
     $('#js_input_cxfsq').val("");
     $('#js_input_cfdq').val("");
     $('#js_input_mddq').val("");
@@ -590,7 +590,7 @@ function splice(obj) {
 //近日报告
 function ribaoInitialization(reportId) {
   if (reportId == null)
-    return;
+    reportId = 0;
   var userId = $("#userId").val();
   $.ajax({
     url: '/home/home/queryRibaoRefresh',
@@ -931,25 +931,25 @@ function ribao_add() {
 function ribao_cancel() {
   $('#cancel').on('click', function () {
 
-      listcx.splice(0, listcx.length);
-      $('#tabtr').empty();
-      $("#js_input_cfd").val("");
-      $("#js_input_cfd").attr("data-values", "");
-      $("#js_input_mdd").val("");
-      $("#js_input_mdd").attr("data-values", "");
-      $("#js_input_cxfs").val("");
-      $("#js_input_cxfs").attr("data-values", "");
-      $("#js_input_gzzd").val("");
-      $("#js_input_gzzd").attr("data-values", "");
-      $("#js_input_jrszd").val("");
-      $("#js_input_jrszd").attr("data-values", "");
-      $("#js_input_sf").val("");
-      $("#js_input_sf").attr("data-values", "");
-      $("#js_input_qtdd").val("");
-      $("#js_input_jrszq").val("");
-      $("#js_input_cfdq").val("");
-      $("#js_input_mddq").val("");
-      $("#js_input_cxfsq").val("");
+    listcx.splice(0, listcx.length);
+    $('#tabtr').empty();
+    $("#js_input_cfd").val("");
+    $("#js_input_cfd").attr("data-values", "");
+    $("#js_input_mdd").val("");
+    $("#js_input_mdd").attr("data-values", "");
+    $("#js_input_cxfs").val("");
+    $("#js_input_cxfs").attr("data-values", "");
+    $("#js_input_gzzd").val("");
+    $("#js_input_gzzd").attr("data-values", "");
+    $("#js_input_jrszd").val("");
+    $("#js_input_jrszd").attr("data-values", "");
+    $("#js_input_sf").val("");
+    $("#js_input_sf").attr("data-values", "");
+    $("#js_input_qtdd").val("");
+    $("#js_input_jrszq").val("");
+    $("#js_input_cfdq").val("");
+    $("#js_input_mddq").val("");
+    $("#js_input_cxfsq").val("");
 
 
     if ($('#ribao')[0].style.display == 'none') {
@@ -964,11 +964,11 @@ function ribao_cancel() {
 }
 
 function ribaoCommit() {
-    var sf = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
-    if(listcx.length == 0 && sf == 1){
-        $.alert("请添加出行");
-        return;
-    }
+  var sf = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
+  if (listcx.length == 0 && sf == 1) {
+    $.alert("请添加出行");
+    return;
+  }
   var suspectedId = $("#suspectedId").val();
   var userId = $("#userId").val();
   var userName = $("#js_input_user_name").val();

whepi-web/src/main/java/com/bofeng/wx/controller/MsReportController.java

@@ -129,13 +129,12 @@ public class MsReportController {
     @GetMapping("/home/home/queryRibaoRefresh")
     public Model<List<MsSuspected>> queryRibaoRefresh(@Pd(name = "reportId") Long reportId, @Pd(name = "userCreate") Long userCreate) {
         //今日有记录
-        List<MsSuspected> list = msReportService.getByReportId(reportId);
-        if (list != null && list.size() > 0)
-            return Model.newSuccess(list);
-            //获取用户最新的记录
-        else {
+        if(reportId==0){
             return Model.newSuccess(msSuspectedService.selectNextSuspected(userCreate));
         }
+        else {
+            return Model.newSuccess(msReportService.getByReportId(reportId));
+        }
     }
 
     //全家报平安