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

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

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/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;
@@ -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,8 +157,8 @@ 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);
             msReportMapper.updateById(msReport);

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