Merge remote-tracking branch 'origin/master'

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

@@ -32,11 +32,11 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
     Integer selectSingleRoomNum(@Param("reportId") Long reportId, @Param("singleRoom") Integer singleRoom);
 
     //正常
-    @Select("select count(*) from ms_suspected where report_id=#{reportId} and  #{temperature}<![CDATA[ >=]]> 36 and #{temperature}<![CDATA[ <= ]]>37.3")
-    Integer selectisSuspectedNum(@Param("reportId") Long reportId, @Param("temperature") BigDecimal temperature);
+    @Select("select count(*) from ms_suspected where report_id=#{reportId} and  temperature>= 36 and temperature<=37.3")
+    Integer selectisSuspectedNum(@Param("reportId") Long reportId);
 
     //疑似
-    @Select("select count(*) from ms_suspected where report_id=#{reportId} and (#{temperature} &lt; 36 or 37.3 &lt; #{temperature})")
-    Integer selectisNoSuspectedNum(@Param("reportId") Long reportId, @Param("temperature") BigDecimal 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/service/MsSuspectedService.java

@@ -34,13 +34,12 @@ public class MsSuspectedService {
     //查询家人
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public MsSuspected selectSuspected(long suspectedId) {
-
         return msSuspectedMapper.selectById(suspectedId);
     }
 
     //添加家人
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void addSuspected(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;
@@ -73,44 +72,12 @@ public class MsSuspectedService {
             reportId = listReport.get(0).getReportId();
         }
 
-        //添加家人
-        MsSuspected msSuspected = new MsSuspected();
-        msSuspected.setSuspectedId(IdWorker.getId());
-        msSuspected.setReportId(reportId);
-        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);
-        msSuspected.setUserCreate(userCreate);
-        msSuspected.setTimeCreate(DateTime.now());
-        msSuspected.setUserUpdate(userCreate);
-        msSuspected.setTimeUpdate(DateTime.now());
-        msSuspectedMapper.insert(msSuspected);
-
-        //更新今日日报
-        updateReport(msSuspected.getReportId(),msSuspected.getMedical(),msSuspected.getSingleRoom(),msSuspected.getTemperature());
-
-    }
-
-
-    //编辑家人
-    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void editSuspected(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) {
-
-        MsSuspected msSuspected = msSuspectedMapper.selectById(suspectedId);
-        if (msSuspected != null) {
+        MsSuspected msSuspected;
+        if(suspectedId==0L){
+            //添加家人
+            msSuspected = new MsSuspected();
+            msSuspected.setSuspectedId(IdWorker.getId());
+            msSuspected.setReportId(reportId);
             msSuspected.setUserName(userName);
             msSuspected.setGrender(grender);//默认为家人
             msSuspected.setAge(age);
@@ -125,11 +92,35 @@ public class MsSuspectedService {
             msSuspected.setDiarrhea(diarrhea);
             msSuspected.setSingleRoom(singleRoom);
             msSuspected.setOthers(others);
-            msSuspectedMapper.updateById(msSuspected);
-
-            //更新今日日报
-            updateReport(msSuspected.getReportId(),msSuspected.getMedical(),msSuspected.getSingleRoom(),msSuspected.getTemperature());
+            msSuspected.setUserCreate(userCreate);
+            msSuspected.setTimeCreate(DateTime.now());
+            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);
+            }
+        }
+
+        //更新今日日报
+        updateReport(msSuspected.getReportId(),msSuspected.getMedical(),msSuspected.getSingleRoom(),msSuspected.getTemperature());
 
     }
 
@@ -157,8 +148,8 @@ public class MsSuspectedService {
         //疑似
         if (temperature.compareTo(new BigDecimal(0)) == 1) {
             //正常
-            isSuspected = msReportMapper.selectisSuspectedNum(reportId, temperature);
-            isNoSuspected = msReportMapper.selectisNoSuspectedNum(reportId, temperature);
+            isSuspected = msReportMapper.selectisSuspectedNum(reportId);
+            isNoSuspected = msReportMapper.selectisNoSuspectedNum(reportId);
         }
         //今日居家
         List<MsSuspected> list = msSuspectedMapper.selectByReportId(reportId);

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

@@ -49,10 +49,12 @@ public class HomeController {
     public ModelAndView home(ModelMap model) throws JsonProcessingException {
         model.put("user", new JsonWapper("{\"www\": \"er\"}"));
         //初始化今日日报
-        // UserOpen userOpen = homeService.getUserOpen();
-        // Long userId = userOpen.getUserId();
-        Long userId = 1224706869998772226L;
+        UserOpen userOpen = homeService.getUserOpen();
+        Long userId = userOpen.getUserId();
+        //Long userId = 1224706869998772226L;
         MsReport msReport = msReportService.getReportByDateNow(userId);
+        //根据昨天的获取今天的
+        msReportService.getNowByYesterday(userId);
         model.put("msReport", new JsonWapper(msReport));
         return new ModelAndView("/home/home.ftl", model);
     }

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

@@ -33,6 +33,7 @@ public class MsReportController {
     @PostMapping("/home/addRibao")
     public Integer saveUser(HttpServletRequest request) {
         //初始化今日日报
+        Long suspectedId = Long.parseLong(request.getParameter("suspectedId"));
         Long userCreate = Long.parseLong(request.getParameter("userCreate"));
         String userName = request.getParameter("userName");
         Integer grender = Integer.parseInt(request.getParameter("grender"));
@@ -48,7 +49,7 @@ public class MsReportController {
         Integer diarrhea = Integer.parseInt(request.getParameter("diarrhea"));
         Integer singleRoom = Integer.parseInt(request.getParameter("singleRoom"));
         String others = request.getParameter("others");
-        msSuspectedService.addSuspected(userName, grender, age, familyStatus, statusDesp, medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea, singleRoom, others, userCreate);
+        msSuspectedService.addSuspected(suspectedId,userName, grender, age, familyStatus, statusDesp, medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea, singleRoom, others, userCreate);
         return 1;
     }
 
@@ -60,29 +61,6 @@ public class MsReportController {
         return msSuspectedService.selectSuspected(suspectedId);
     }
 
-    //修改家人
-    @PostMapping("/home/updateSuspected")
-    public Integer updateSuspected(HttpServletRequest request) {
-        //初始化今日日报
-        Long suspectedId = Long.parseLong(request.getParameter("suspectedId"));
-        String userName = request.getParameter("userName");
-        Integer grender = Integer.parseInt(request.getParameter("grender"));
-        Integer age = Integer.parseInt(request.getParameter("age"));
-        Integer familyStatus = Integer.parseInt(request.getParameter("familyStatus"));
-        String statusDesp = request.getParameter("statusDesp");
-        Integer medical = Integer.parseInt(request.getParameter("medical"));
-        BigDecimal temperature = new BigDecimal(request.getParameter("temperature"));
-        Integer cough = Integer.parseInt(request.getParameter("cough"));
-        Integer muscle = Integer.parseInt(request.getParameter("muscle"));
-        Integer dyspnea = Integer.parseInt(request.getParameter("dyspnea"));
-        Integer fatigue = Integer.parseInt(request.getParameter("fatigue"));
-        Integer diarrhea = Integer.parseInt(request.getParameter("diarrhea"));
-        Integer singleRoom = Integer.parseInt(request.getParameter("singleRoom"));
-        String others = request.getParameter("others");
-        msSuspectedService.editSuspected(suspectedId, userName, grender, age, familyStatus, statusDesp, medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea, singleRoom, others);
-        return 1;
-    }
-
     //删除家人病例
     @PostMapping("/home/deleteSuspected")
     public Integer deleteSuspected(HttpServletRequest request) {