xielianghe

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

@@ -32,6 +32,8 @@ public class MsReportService {
     private MsReportMapper msReportMapper;
     @Autowired
     private MsReportService msReportService;
+    @Autowired
+    private MsSuspectedService msSuspectedService;
 
     public List<MsSuspected> getByReportId(Long reportId) {
         return msSuspectedMapper.selectByReportId(reportId);

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

@@ -83,7 +83,7 @@ public class MsSuspectedService {
         if (singleRoom == 1)
             suspectedStatus = 1;
         //体温
-        if (Conv.NFloat(temperature) < Conv.NFloat(36) || Conv.NFloat(temperature) > Conv.NFloat(37.3))
+        if (Conv.NFloat(temperature) < Conv.NFloat(35) || Conv.NFloat(temperature) > Conv.NFloat(37.3))
             suspectedStatus = 1;
         //咳嗽
         if (cough > 0)
@@ -102,9 +102,20 @@ public class MsSuspectedService {
             suspectedStatus = 1;
         if (suspectedId == 0L) {
             //判断家人是否同名
-            List<MsSuspected> list = msSuspectedMapper.selectUserNameNum(reportId, userName,reportDate);
+            List<MsSuspected> list = msSuspectedMapper.selectUserNameNum(reportId, userName, reportDate);
             if (list != null && list.size() > 0)
                 return 2L;
+            //判断是否评估
+            if (scoreRezult == 0) {
+                MsSuspected msSuspected1 = getScore(0L, userName, temperature, cough, muscle, dyspnea, fatigue, diarrhea, userCreate);
+                if (msSuspected1 != null) {
+                    scoreRezult = msSuspected1.getScoreRezult();
+                    score = msSuspected1.getScore();
+                    temperatureScore = msSuspected1.getTemperatureScore();
+                    scoreHistroy = msSuspected1.getScoreHistroy();
+                }
+            }
+
             MsSuspected msSuspected = new MsSuspected();
             msSuspected.setSuspectedId(IdWorker.getId());
             msSuspected.setReportId(reportId);
@@ -134,7 +145,7 @@ public class MsSuspectedService {
             msSuspectedMapper.insert(msSuspected);
         } else {
             //判断家人是否同名
-            List<MsSuspected> list = msSuspectedMapper.selectUserNameNum(reportId, userName,reportDate);
+            List<MsSuspected> list = msSuspectedMapper.selectUserNameNum(reportId, userName, reportDate);
             if (list != null && list.size() > 0) {
                 if (list.size() > 1)
                     return 2L;
@@ -143,6 +154,14 @@ public class MsSuspectedService {
                         return 2L;
                 }
             }
+            MsSuspected msSuspected2 = getScore(suspectedId, userName, temperature, cough, muscle, dyspnea, fatigue, diarrhea, userCreate);
+            if (msSuspected2 != null) {
+                scoreRezult = msSuspected2.getScoreRezult();
+                score = msSuspected2.getScore();
+                temperatureScore = msSuspected2.getTemperatureScore();
+                scoreHistroy = msSuspected2.getScoreHistroy();
+            }
+
             MsSuspected msSuspected1 = msSuspectedMapper.selectById(suspectedId);
             if (msSuspected1 != null) {
                 msSuspected1.setUserName(userName);
@@ -293,9 +312,9 @@ public class MsSuspectedService {
             if (score - scoreHistory >= 3)
                 return 4;
             else {
-                if (score <= 1)
+                if (score < 1)
                     scoreRezult = 1;
-                if (score >= 2 && score <= 3)
+                if (score >= 1 && score <= 3)
                     scoreRezult = 2;
                 if (score == 4)
                     scoreRezult = 3;