xielianghe

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

@@ -113,7 +113,7 @@ 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);

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

@@ -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);
@@ -97,7 +97,7 @@ public class MsSuspectedService {
             msSuspected.setTimeUpdate(DateTime.now());
             msSuspectedMapper.insert(msSuspected);
         } else {
-            MsSuspected  msSuspected1 = msSuspectedMapper.selectById(suspectedId);
+            MsSuspected msSuspected1 = msSuspectedMapper.selectById(suspectedId);
             if (msSuspected1 != null) {
                 msSuspected1.setUserName(userName);
                 msSuspected1.setGrender(grender);//默认为家人
@@ -160,7 +160,10 @@ public class MsSuspectedService {
             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);
         }
     }