Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/ribao.js

@@ -1240,6 +1240,7 @@ function ribaoCommit() {
       $('#txt_shangbao').empty();
       $('#txt_shangbao').append("今日未上报");
       $('#txt_shangbaotime').empty();
+      $.toast("操作成功后请点击上报");
     },
   });
 }
@@ -1263,6 +1264,7 @@ function deleteSuspected(suspectedId) {
       $('#txt_shangbao').append("今日未上报");
       $('#txt_shangbaotime').empty();
       ribao_refrash();
+      $.toast("删除后请重新点击上报");
     },
   });
 }
@@ -1328,15 +1330,15 @@ function updateSuspected(suspectedId) {
         // $("#js_input_user_status").attr("data-values", suspected.familyStatus);
 
         // $("#jibenmiaoshu").val(suspected.statusDesp);
-        if(suspected.medical==0)
-            $("input[id='s18']").prop("checked", "checked");
-        if(suspected.medical==1)
+        if (suspected.medical == 0)
+          $("input[id='s18']").prop("checked", "checked");
+        if (suspected.medical == 1)
           $("input[id='s19']").prop("checked", "checked");
-        if(suspected.medical==2)
+        if (suspected.medical == 2)
           $("input[id='s20']").prop("checked", "checked");
-        if(suspected.medical==3)
+        if (suspected.medical == 3)
           $("input[id='s21']").prop("checked", "checked");
-        if(suspected.medical==4)
+        if (suspected.medical == 4)
           $("input[id='s22']").prop("checked", "checked");
         // $("#switchQuezhen").val(getMedical(suspected.medical));
         // $("#switchQuezhen").attr("data-values", suspected.medical);

whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoLY.java

@@ -237,6 +237,18 @@ public class ExcelRiBaoLY {
         if (medical == 1) {
             bingqingDesc += "已确诊、";
         }
+        else if (medical == 2) {
+            bingqingDesc += "疑似、";
+        }
+
+        else if (medical == 3) {
+            bingqingDesc += "有接触史、";
+        }
+
+        else if (medical == 5) {
+            bingqingDesc += "解除隔离、";
+        }
+
 
         if (singleRoom == 1) {
             bingqingDesc += "单间隔离、";

whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoLYBM4.java

@@ -227,6 +227,17 @@ public class ExcelRiBaoLYBM4 {
         if (medical == 1) {
             bingqingDesc += "已确诊、";
         }
+        else if (medical == 2) {
+            bingqingDesc += "疑似、";
+        }
+
+        else if (medical == 3) {
+            bingqingDesc += "有接触史、";
+        }
+
+        else if (medical == 5) {
+            bingqingDesc += "解除隔离、";
+        }
 
         if (singleRoom == 1) {
             bingqingDesc += "单间隔离、";

whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoPrivate.java

@@ -250,6 +250,17 @@ public class ExcelRiBaoPrivate {
         if (medical == 1) {
             bingqingDesc += "已确诊、";
         }
+        else if (medical == 2) {
+            bingqingDesc += "疑似、";
+        }
+
+        else if (medical == 3) {
+            bingqingDesc += "有接触史、";
+        }
+
+        else if (medical == 5) {
+            bingqingDesc += "解除隔离、";
+        }
 
         if (singleRoom == 1) {
             bingqingDesc += "单间隔离、";

whepi-web/src/main/java/com/bofeng/service/MsSuspectedService.java

@@ -120,7 +120,7 @@ public class MsSuspectedService {
         //判断是否疑似
         Integer suspectedStatus = 0;
         //确诊
-        if (medical == 1)
+        if (medical > 1 && medical<4)
             suspectedStatus = 1;
         //隔离
         if (singleRoom == 1)