xielianghe

whepi-ui/templates/home/ribao.js

@@ -1234,13 +1234,33 @@ function ribaoCommit() {
       ribao_refrash();
 
       clearShow();
-      canSahngbao = true;
-      document.getElementById("btn_shangbao").style['background-color'] = "#0bb20c";
-      document.getElementById("txt_shangbao").style['color'] = "red";
-      $('#txt_shangbao').empty();
-      $('#txt_shangbao').append("今日未上报");
-      $('#txt_shangbaotime').empty();
-      $.toast("操作成功后请点击上报");
+      //修改
+      if(suspectedId>0){
+        var date = new Date();
+        var year = date.getFullYear();
+        var month = date.getMonth() + 1;
+        var day = date.getDate();
+        var hour = date.getHours();
+        var minute = date.getMinutes();
+        var second = date.getSeconds();
+        var time = year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
+        canSahngbao = false;
+        document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
+        document.getElementById("txt_shangbao").style['color'] = "#0bb20c";
+        document.getElementById("txt_shangbaotime").style['color'] = "#0bb20c";
+        $('#txt_shangbao').empty();
+        $('#txt_shangbao').append("今日已上报");
+        $('#txt_shangbaotime').empty();
+        $('#txt_shangbaotime').append("上报时间：" + time);
+      }
+      else {
+        canSahngbao = true;
+        document.getElementById("btn_shangbao").style['background-color'] = "#0bb20c";
+        document.getElementById("txt_shangbao").style['color'] = "red";
+        $('#txt_shangbao').empty();
+        $('#txt_shangbao').append("今日未上报");
+        $('#txt_shangbaotime').empty();
+      }
     },
   });
 }

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

@@ -292,6 +292,49 @@ public class MsSuspectedService {
             msReportMapper.updateById(msReport);
         }
     }
+
+    //更新今日日报,直接上报
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public void updateReportStatus(Long reportId, Integer medical, Integer singleRoom, BigDecimal temperature) {
+        //更新今日日报
+        Integer trueNum = 0, singleNum = 0, isSuspected = 0, isNoSuspected = 0, isFamliy = 0, abnormalNum = 0;
+
+        //确诊
+        trueNum = msReportMapper.selectSuspectedNum(reportId);
+
+        //居家隔离
+        singleNum = msReportMapper.selectSingleRoomNum(reportId);
+
+        //正常
+        isSuspected = msReportMapper.selectisSuspectedNum(reportId);
+
+        //疑似
+        isNoSuspected = msReportMapper.selectisNoSuspectedNum(reportId);
+
+        //异常人数
+        abnormalNum = msReportMapper.selectAbnormalNum(reportId);
+
+        //今日居家
+        List<MsSuspected> list = msSuspectedMapper.selectByReportId(reportId);
+        if (list != null && list.size() > 0)
+            isFamliy = list.size();
+        MsReport msReport = msReportMapper.selectById(reportId);
+        if (msReport != null) {
+            msReport.setSureNum(trueNum);
+            msReport.setSingleNum(singleNum);
+            msReport.setSuspectedNum(isNoSuspected);
+            msReport.setNormalNum(isSuspected);
+            msReport.setSafetyNum(isFamliy);
+            if (isNoSuspected > 0 || abnormalNum > 0)
+                msReport.setMsStatus(2);
+            else
+                msReport.setMsStatus(1);
+            msReport.setReportStatus(1);
+            msReport.setReportDate(DateTime.now().toDate());
+            msReport.setTimeUpdate(DateTime.now());
+            msReportMapper.updateById(msReport);
+        }
+    }
     //健康评估
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public MsSuspected getScore(Long susprectedId, String userName, Integer medical, BigDecimal temperature, Integer cough, Integer muscle, Integer dyspnea, Integer fatigue, Integer diarrhea, Long userCreate) {

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

@@ -175,6 +175,8 @@ public class MsTripService {
                     }
                 }
             }
+            //更新今日日报
+            msSuspectedService.updateReport(reportId, medical, singleRoom, temperature);
 
         } else {
             //判断家人是否同名
@@ -259,9 +261,9 @@ public class MsTripService {
                     msTripDetMapper.insert(msTripDet1);
                 }
             }
+            //更新今日日报,直接上报
+            msSuspectedService.updateReportStatus(reportId, medical, singleRoom, temperature);
         }
-        //更新今日日报
-        msSuspectedService.updateReport(reportId, medical, singleRoom, temperature);
         return reportId;
     }
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)