Merge remote-tracking branch 'origin/master'

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

@@ -189,12 +189,12 @@ public class MsReportService {
         List<MsSuspected> listSuspected = msSuspectedMapper.selectByReportId(Long.parseLong(listReport.get(0).getReportId().toString()));
         if (listSuspected == null || listSuspected.size() == 0)
             return 3;
-        // if (unit != null) {
-        //     if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
-        //         if (listSuspected != null && listSuspected.size() > 1)
-        //             return 5;
-        //     }
-        // }
+            // if (unit != null) {
+            //     if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
+            //         if (listSuspected != null && listSuspected.size() > 1)
+            //             return 5;
+            //     }
+            // }
         else {
             for (MsSuspected msSuspected : listSuspected) {
                 //体温是否填写
@@ -202,19 +202,19 @@ public class MsReportService {
                     return 2;
 
                 //如果是凌云，判断出行是否填写异常
-                // UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userCreate);
-                // if (unit != null) {
-                //     if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
-                //         //上一天的上报记录.3天内
-                //         List<MsSuspected> listSuspected1 = msSuspectedMapper.selectNext3Suspected(userCreate);
-                //         if (listSuspected1 != null && listSuspected1.size() > 0) {
-                //             if (listSuspected1.get(0).getTodayLocalOther() != msSuspected.getTodayLocalOther() && listSuspected1.get(0).getTodayLocal() != msSuspected.getTodayLocal() && msSuspected.getIsTrip() == 0) {
-                //                 return 4;
-                //             }
-                //         }
-                //
-                //     }
-                // }
+                UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userCreate);
+                if (unit != null) {
+                    if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
+                        //上一天的上报记录.3天内
+                        List<MsSuspected> listSuspected1 = msSuspectedMapper.selectNext3Suspected(userCreate);
+                        if (listSuspected1 != null && listSuspected1.size() > 0) {
+                            if (listSuspected1.get(0).getTodayLocalOther() != msSuspected.getTodayLocalOther() && listSuspected1.get(0).getTodayLocal() != msSuspected.getTodayLocal() && msSuspected.getIsTrip() == 0) {
+                                return 4;
+                            }
+                        }
+
+                    }
+                }
             }
 
         }