Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

whepi-ui/templates/home/ribao.js

@@ -286,10 +286,10 @@ function ribao_cell(v) {
   var fatigue = "乏力：" + getFatigue(v.fatigue) + "；";
   var diarrhea = "腹泻：" + getDiarrhea(v.diarrhea) + "；";
   var others = "其他：" + v.others;
-  $('#rb_family').append($('<div class="weui-media-box weui-media-box_text">\n' +
+  $('#rb_family').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\n' +
     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #bc4246" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId) + ')\'>删除</a>\n' +
     '                                      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'updateSuspected(' + JSON.stringify(v.suspectedId) + ')\'>修改</a></h4>\n' +
-    '                                      <p class="weui-media-box__desc">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + '</p>\n' +
+    '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -309,6 +309,7 @@ function ribao_add() {
 
 function ribao_cancel() {
   $('#cancel').on('click', function () {
+
     if ($('#ribao')[0].style.display == 'none') {
       $('#notOpenRibao').toggle();
       $('#ribao')[0].style.display = '';
@@ -316,6 +317,7 @@ function ribao_cancel() {
       $('#notOpenRibao')[0].style.display = '';
       $('#ribao')[0].style.display = 'none';
     }
+    clearShow();
   });
 }
 
@@ -359,22 +361,22 @@ function ribaoCommit() {
   var diarrhea = $("#js_input_user_fuxie").attr("data-values") == undefined ? 0 : $("#js_input_user_fuxie").attr("data-values");
   var others = $("#shuruqita").val()== undefined ? "" : $("#jibenmiaoshu").val();
 
-  // if (userName == undefined || userName == '') {
-  //   alert("请填写姓名");
-  //   return;
-  // }
-  // if (age == undefined || age == '') {
-  //   alert("请填写年龄");
-  //   return;
-  // }
-  // if (grender == 0) {
-  //   alert("请填写性别");
-  //   return;
-  // }
-  // if (temperature <= 0) {
-  //   alert("请填写体温");
-  //   return;
-  // }
+  if (userName == undefined || userName == '') {
+    alert("请填写姓名");
+    return;
+  }
+  if (age == undefined || age == '') {
+    alert("请填写年龄");
+    return;
+  }
+  if (grender == 0) {
+    alert("请填写性别");
+    return;
+  }
+  if (temperature <= 0) {
+    alert("请填写体温");
+    return;
+  }
 
   $.ajax({
     url: '/home/addRibao',
@@ -406,6 +408,9 @@ function ribaoCommit() {
         $('#ribao')[0].style.display = 'none';
       }
       ribao_refrash();
+
+      clearShow();
+
     },
   });
 }
@@ -492,7 +497,7 @@ function addReport() {
       "userCreate": userId,
     },
     success: function (data) {
-      $.toast("操作成功");
+      $.toast(data.msg);
     },
   });
 }
@@ -546,9 +551,9 @@ function helpValue1(v) {
   var fatigue = "乏力：" + getFatigue(v.fatigue) + "；";
   var diarrhea = "腹泻：" + getDiarrhea(v.diarrhea) + "；";
   var others = "其他：" + v.others;
-  $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text">\n' +
+  $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\n' +
     '                                      <h4 class="weui-media-box__title">'  + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age  + '</h4>\n' +
-    '                                      <p class="weui-media-box__desc">' +familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others  + '</p>\n' +
+    '                                      <p class="weui-media-box__desc" style="height: 80%">' +familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others  + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -663,4 +668,40 @@ function getDiarrhea(diarrhea) {
   return "";
 }
 
+function clearShow() {
+  console.log("qingkong")
+  $("#suspectedId").val("");
+  $("#js_input_user_sex").val("");
+  $("#js_input_user_sex").attr("data-values","");
+  $("#js_input_user_name").val("");
+  $("#js_input_user_age").val("");
+  $("#js_input_user_status").val("");
+  $("#js_input_user_status").attr("data-values","");
+
+  $("#jibenmiaoshu").val("");
+
+  $("#switchQuezhen").val("");
+  $("#switchQuezhen").attr("data-values","");
+
+  $("#switchDanjiangeli").val("");
+  $("#switchDanjiangeli").attr("data-values","");
+
+  $("#js_input_user_tiwen").val( "");
+
+  $("#js_input_user_kesou").val("");
+  $("#js_input_user_kesou").attr("data-values","");
+
+  $("#js_input_user_jirou").val("");
+  $("#js_input_user_jirou").attr("data-values","");
+
+  $("#js_input_user_huxi").val("");
+  $("#js_input_user_huxi").attr("data-values","");
+
+  $("#js_input_user_fali").val("");
+  $("#js_input_user_fali").attr("data-values","");
+
+  $("#js_input_user_fuxie").val("");
+  $("#js_input_user_fuxie").attr("data-values","");
+}
+
 

whepi-web/src/main/java/com/bofeng/dao/MsReportMapper.java

@@ -36,7 +36,7 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
     Integer selectisSuspectedNum(@Param("reportId") Long reportId);
 
     //疑似
-    @Select("select count(*) from ms_suspected where report_id=#{reportId} and (temperature<36 or 37.3>temperature)")
+    @Select("select count(*) from ms_suspected where report_id=#{reportId} and (temperature<36 or 37.3<temperature)")
     Integer selectisNoSuspectedNum(@Param("reportId") Long reportId);
 
 }

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

@@ -125,6 +125,6 @@ public class MsSuspected {
     @TableField(exist = false)
     private Integer singleNum;
 
-    @TableField("single_room")
+    @TableField(exist = false)
     private String singleRoomStr;
 }

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

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -50,7 +51,7 @@ public class MsReportService {
     //获取今天数据
     public MsReport getReportByDateNow(Long userCreate) {
         //根据昨天的获取今天的
-       msReportService.getNowByYesterday(userCreate);
+        msReportService.getNowByYesterday(userCreate);
         Date t = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         String reportDate = df.format(t);
@@ -64,11 +65,20 @@ public class MsReportService {
 
     //上报
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void addReport(Long userCreate) {
+    public Integer addReport(Long userCreate) {
         Date t = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         String reportDate = df.format(t);
         List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate, userCreate);
+        if (listReport == null || listReport.size() == 0)
+            return 0;
+
+        //判断体温是否填写
+        List<MsSuspected> listSuspected = msSuspectedMapper.selectByReportId(Long.parseLong(listReport.get(0).getReportId().toString()));
+        for (MsSuspected msSuspected : listSuspected) {
+            if (msSuspected.getTemperature().compareTo(new BigDecimal(0)) == 0)
+                return 2;
+        }
         MsReport msReport = msReportMapper.selectById(Long.parseLong(listReport.get(0).getReportId().toString()));
         if (msReport != null) {
             msReport.setReportStatus(1);
@@ -76,6 +86,7 @@ public class MsReportService {
             msReport.setTimeUpdate(DateTime.now());
             msReportMapper.updateById(msReport);
         }
+        return 1;
     }
 
     //通过昨天数据更新今天数据
@@ -88,7 +99,7 @@ public class MsReportService {
         //判断今天是否有数据
         String DateNow = sj.format(d);
         List<MsReport> listReport = msReportMapper.selectByReportDate(DateNow, userCreate);
-        if(listReport!=null && listReport.size()>0)
+        if (listReport != null && listReport.size() > 0)
             return;
 
         //判断昨天是否有数据
@@ -101,8 +112,8 @@ public class MsReportService {
         if (listReport1 != null && listReport1.size() > 0) {
             //添加到今天日报
             MsReport msReport = msReportMapper.selectById(Long.parseLong(listReport1.get(0).getReportId().toString()));
-            Long reportId=0L;
-            if (msReport != null ) {
+            Long reportId = 0L;
+            if (msReport != null) {
                 MsReport msReport1 = new MsReport();
                 msReport1.setReportId(IdWorker.getId());
                 msReport1.setHouseId(msReport.getHouseId());
@@ -113,13 +124,13 @@ public class MsReportService {
                 msReport1.setSingleNum(msReport.getSingleNum());
                 msReport1.setRemarks(msReport.getRemarks());
                 msReport1.setReportDate(DateTime.now().toDate());
-                msReport1.setMsStatus(2);
+                msReport1.setMsStatus(msReport.getMsStatus());
                 msReport1.setUserCreate(userCreate);
                 msReport1.setTimeCreate(DateTime.now());
                 msReport1.setUserUpdate(userCreate);
                 msReport1.setTimeUpdate(DateTime.now());
                 msReportMapper.insert(msReport1);
-                reportId=msReport1.getReportId();
+                reportId = msReport1.getReportId();
             }
             //添加今日家庭
             List<MsSuspected> listSuspected = msSuspectedMapper.selectByReportId(Long.parseLong(listReport1.get(0).getReportId().toString()));
@@ -134,7 +145,7 @@ public class MsReportService {
                     msSuspected1.setFamilyStatus(msSuspected.getFamilyStatus());
                     msSuspected1.setStatusDesp(msSuspected.getStatusDesp());
                     msSuspected1.setMedical(msSuspected.getMedical());
-                    msSuspected1.setTemperature(msSuspected.getTemperature());
+                    msSuspected1.setTemperature(new BigDecimal(0));
                     msSuspected1.setCough(msSuspected.getCough());
                     msSuspected1.setMuscle(msSuspected.getMuscle());
                     msSuspected1.setDiarrhea(msSuspected.getDiarrhea());

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

@@ -39,7 +39,7 @@ public class MsSuspectedService {
 
     //添加家人
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void addSuspected(Long suspectedId,String userName, Integer grender, Integer age, Integer familyStatus,
+    public void addSuspected(Long suspectedId, String userName, Integer grender, Integer age, Integer familyStatus,
                              String statusDesp, Integer medical, BigDecimal temperature, Integer cough, Integer muscle,
                              Integer dyspnea, Integer fatigue, Integer diarrhea, Integer singleRoom, String others, Long userCreate) {
         Long reportId = 0L;
@@ -61,7 +61,7 @@ public class MsSuspectedService {
             msReport.setSingleNum(0);
             msReport.setRemarks("");
             msReport.setReportDate(DateTime.now().toDate());
-            msReport.setMsStatus(2);
+            msReport.setMsStatus(0);
             msReport.setUserCreate(userCreate);
             msReport.setTimeCreate(DateTime.now());
             msReport.setUserUpdate(userCreate);
@@ -72,10 +72,9 @@ public class MsSuspectedService {
             reportId = listReport.get(0).getReportId();
         }
 
-        MsSuspected msSuspected;
-        if(suspectedId==0L){
+        if (suspectedId == 0L) {
             //添加家人
-            msSuspected = new MsSuspected();
+            MsSuspected msSuspected = new MsSuspected();
             msSuspected.setSuspectedId(IdWorker.getId());
             msSuspected.setReportId(reportId);
             msSuspected.setUserName(userName);
@@ -97,30 +96,29 @@ public class MsSuspectedService {
             msSuspected.setUserUpdate(userCreate);
             msSuspected.setTimeUpdate(DateTime.now());
             msSuspectedMapper.insert(msSuspected);
-        }
-        else {
-            msSuspected = msSuspectedMapper.selectById(suspectedId);
-            if (msSuspected != null) {
-                msSuspected.setUserName(userName);
-                msSuspected.setGrender(grender);//默认为家人
-                msSuspected.setAge(age);
-                msSuspected.setFamilyStatus(familyStatus);
-                msSuspected.setStatusDesp(statusDesp);
-                msSuspected.setMedical(medical);
-                msSuspected.setTemperature(temperature);
-                msSuspected.setCough(cough);
-                msSuspected.setMuscle(muscle);
-                msSuspected.setDiarrhea(dyspnea);
-                msSuspected.setFatigue(fatigue);
-                msSuspected.setDiarrhea(diarrhea);
-                msSuspected.setSingleRoom(singleRoom);
-                msSuspected.setOthers(others);
-                msSuspectedMapper.updateById(msSuspected);
+        } else {
+            MsSuspected msSuspected1 = msSuspectedMapper.selectById(suspectedId);
+            if (msSuspected1 != null) {
+                msSuspected1.setUserName(userName);
+                msSuspected1.setGrender(grender);//默认为家人
+                msSuspected1.setAge(age);
+                msSuspected1.setFamilyStatus(familyStatus);
+                msSuspected1.setStatusDesp(statusDesp);
+                msSuspected1.setMedical(medical);
+                msSuspected1.setTemperature(temperature);
+                msSuspected1.setCough(cough);
+                msSuspected1.setMuscle(muscle);
+                msSuspected1.setDiarrhea(dyspnea);
+                msSuspected1.setFatigue(fatigue);
+                msSuspected1.setDiarrhea(diarrhea);
+                msSuspected1.setSingleRoom(singleRoom);
+                msSuspected1.setOthers(others);
+                msSuspectedMapper.updateById(msSuspected1);
             }
         }
 
         //更新今日日报
-        updateReport(msSuspected.getReportId(),msSuspected.getMedical(),msSuspected.getSingleRoom(),msSuspected.getTemperature());
+        updateReport(reportId, medical, singleRoom, temperature);
 
     }
 
@@ -131,9 +129,10 @@ public class MsSuspectedService {
         if (msSuspected != null) {
             msSuspectedMapper.deleteById(suspectedId);
             //更新今日日报
-            updateReport(msSuspected.getReportId(),msSuspected.getMedical(),msSuspected.getSingleRoom(),msSuspected.getTemperature());
+            updateReport(msSuspected.getReportId(), msSuspected.getMedical(), msSuspected.getSingleRoom(), msSuspected.getTemperature());
         }
     }
+
     //更新今日日报
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public void updateReport(Long reportId, Integer medical, Integer singleRoom, BigDecimal temperature) {
@@ -145,12 +144,11 @@ public class MsSuspectedService {
         //居家隔离
         if (singleRoom == 1)
             isSingle = msReportMapper.selectSingleRoomNum(reportId, singleRoom);
+        //正常
+        isSuspected = msReportMapper.selectisSuspectedNum(reportId);
         //疑似
-        if (temperature.compareTo(new BigDecimal(0)) == 1) {
-            //正常
-            isSuspected = msReportMapper.selectisSuspectedNum(reportId);
-            isNoSuspected = msReportMapper.selectisNoSuspectedNum(reportId);
-        }
+        isNoSuspected = msReportMapper.selectisNoSuspectedNum(reportId);
+
         //今日居家
         List<MsSuspected> list = msSuspectedMapper.selectByReportId(reportId);
         if (list != null && list.size() > 0)
@@ -159,10 +157,13 @@ public class MsSuspectedService {
         if (msReport != null) {
             msReport.setSureNum(isTrue);
             msReport.setSingleNum(isSingle);
-            msReport.setSuspectedNum(isSuspected);
-            msReport.setNormalNum(isNoSuspected);
+            msReport.setSuspectedNum(isNoSuspected);
+            msReport.setNormalNum(isSuspected);
             msReport.setSafetyNum(isFamliy);
-            msReport.setMsStatus(2);
+            if (isNoSuspected > 0)
+                msReport.setMsStatus(2);
+            else
+                msReport.setMsStatus(1);
             msReportMapper.updateById(msReport);
         }
     }

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

@@ -5,6 +5,7 @@ import com.bofeng.entity.*;
 import com.bofeng.service.MsReportService;
 import com.bofeng.service.MsSuspectedService;
 import com.yvan.Model;
+import com.yvan.ModelOps;
 import com.yvan.mvc.Pd;
 import com.yvan.platform.Conv;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,10 +88,15 @@ public class MsReportController {
 
     //全家报平安
     @PostMapping("/home/addReport")
-    public Integer addReport(HttpServletRequest request) {
+    public ModelOps addReport(HttpServletRequest request) {
         Long userCreate = Long.parseLong(request.getParameter("userCreate"));
-        msReportService.addReport(userCreate);
-        return 1;
+        int re = msReportService.addReport(userCreate);
+        if (re == 1) {
+            return ModelOps.newSuccess();
+        } else if (re == 2) { //没有上报体温
+            return ModelOps.newFail("请填报今日体温！");
+        }
+        return ModelOps.newFail("上报错误");
     }
 
     //根据日期获取家人

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

@@ -60,10 +60,10 @@ public class UserOpenController {
                              @RequestParam(value = "userType", required = false,defaultValue = "0") Integer userType) throws JsonProcessingException {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
-//            UserOpen userOpen = homeService.getUserOpen();
-//            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-            list = userRoleMapper.getUserRoleByUserId(1225325493987995649L);
-            UserOpen userOpen = userOpenMapper.selectByUserId(1225325493987995649L);
+            UserOpen userOpen = homeService.getUserOpen();
+            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//            list = userRoleMapper.getUserRoleByUserId(1225325493987995649L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(1225325493987995649L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\""+userOpen.getUserId()+"\"");

whepi-web/src/main/resources/application-dev.yml

@@ -63,9 +63,9 @@ spring:
     #driverClassName: com.mysql.jdbc.Driver
     #url: jdbc:mysql://localhost:3306/bofeng_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
     driverClassName: net.sf.log4jdbc.DriverSpy
-    url: jdbc:log4jdbc:mysql://39.99.148.1:3306/whepi_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
-    username: whepi_test
-    password: 123456
+    url: jdbc:log4jdbc:mysql://localhost:3306/whepi_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    username: root
+    password:
 
   redis:
     database: 4

whepi-web/src/main/resources/application.yml

@@ -43,7 +43,7 @@ endpoints:
 #  whitelabel.enabled: false
 
 spring:
-  profiles.active: maoyunfeng
+  profiles.active: dev
 
   application:
     name: whepi-web