Merge remote-tracking branch 'origin/master'

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

@@ -318,7 +318,7 @@ public class MsReportService {
                     msSuspected1.setTemperature(new BigDecimal(0));
                     msSuspected1.setCough(msSuspected.getCough());
                     msSuspected1.setMuscle(msSuspected.getMuscle());
-                    msSuspected1.setDiarrhea(msSuspected.getDiarrhea());
+                    msSuspected1.setDyspnea(msSuspected.getDyspnea());
                     msSuspected1.setFatigue(msSuspected.getFatigue());
                     msSuspected1.setDiarrhea(msSuspected.getDiarrhea());
                     msSuspected1.setSingleRoom(msSuspected.getSingleRoom());
@@ -394,7 +394,7 @@ public class MsReportService {
                                         msSuspected1.setTemperature(new BigDecimal(0));//温度0
                                         msSuspected1.setCough(msSuspected.getCough());
                                         msSuspected1.setMuscle(msSuspected.getMuscle());
-                                        msSuspected1.setDiarrhea(msSuspected.getDiarrhea());
+                                        msSuspected1.setDyspnea(msSuspected.getDyspnea());
                                         msSuspected1.setFatigue(msSuspected.getFatigue());
                                         msSuspected1.setDiarrhea(msSuspected.getDiarrhea());
                                         msSuspected1.setSingleRoom(msSuspected.getSingleRoom());
@@ -515,7 +515,7 @@ public class MsReportService {
                 msSuspected1.setTemperature(new BigDecimal(0));
                 msSuspected1.setCough(msSuspected.getCough());
                 msSuspected1.setMuscle(msSuspected.getMuscle());
-                msSuspected1.setDiarrhea(msSuspected.getDiarrhea());
+                msSuspected1.setDyspnea(msSuspected.getDyspnea());
                 msSuspected1.setFatigue(msSuspected.getFatigue());
                 msSuspected1.setDiarrhea(msSuspected.getDiarrhea());
                 //如果是凌云的，不需要复制单间隔离

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

@@ -143,6 +143,7 @@ public class MsSuspectedService {
         //腹泻
         if (diarrhea > 0)
             suspectedStatus = 1;
+
         if (suspectedId == 0L) {
             //判断家人是否同名
             List<MsSuspected> list = msSuspectedMapper.selectUserNameNum(reportId, userName, reportDate);
@@ -171,7 +172,7 @@ public class MsSuspectedService {
             msSuspected.setTemperature(temperature);
             msSuspected.setCough(cough);
             msSuspected.setMuscle(muscle);
-            msSuspected.setDiarrhea(dyspnea);
+            msSuspected.setDyspnea(dyspnea);
             msSuspected.setFatigue(fatigue);
             msSuspected.setDiarrhea(diarrhea);
             msSuspected.setSingleRoom(singleRoom);
@@ -217,7 +218,7 @@ public class MsSuspectedService {
                 msSuspected1.setTemperature(temperature);
                 msSuspected1.setCough(cough);
                 msSuspected1.setMuscle(muscle);
-                msSuspected1.setDiarrhea(dyspnea);
+                msSuspected1.setDyspnea(dyspnea);
                 msSuspected1.setFatigue(fatigue);
                 msSuspected1.setDiarrhea(diarrhea);
                 msSuspected1.setSingleRoom(singleRoom);
@@ -384,11 +385,11 @@ public class MsSuspectedService {
             score += cough;
             //肌肉
             score += muscle;
-            //肌肉
+            //呼吸
             score += dyspnea;
-            //肌肉
+            //乏力
             score += fatigue;
-            //肌肉
+            //腹泻
             score += diarrhea;
         }
 

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

@@ -130,7 +130,7 @@ public class MsTripService {
             msSuspected.setTemperature(temperature);
             msSuspected.setCough(cough);
             msSuspected.setMuscle(muscle);
-            msSuspected.setDiarrhea(dyspnea);
+            msSuspected.setDyspnea(dyspnea);
             msSuspected.setFatigue(fatigue);
             msSuspected.setDiarrhea(diarrhea);
             msSuspected.setSingleRoom(singleRoom);
@@ -213,7 +213,7 @@ public class MsTripService {
                 msSuspected1.setTemperature(temperature);
                 msSuspected1.setCough(cough);
                 msSuspected1.setMuscle(muscle);
-                msSuspected1.setDiarrhea(dyspnea);
+                msSuspected1.setDyspnea(dyspnea);
                 msSuspected1.setFatigue(fatigue);
                 msSuspected1.setDiarrhea(diarrhea);
                 msSuspected1.setSingleRoom(singleRoom);