pcr修改

huimv-admin/src/main/java/com/huimv/admin/service/impl/BillCleanServiceImpl.java

@@ -165,8 +165,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         isolateMapper.insert(isolate);
                     }
                     baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
-                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + billClean.getTestLocation());
-                    baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + billClean.getTestLocationId());
+                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
+                    baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getNextId());
                     String status = baseProcess.getCurrentStatus();
                     String substring = status.substring(0, status.length() - 1);
                     baseProcess.setCurrentStatus(substring + "1," + 0);

huimv-admin/src/main/java/com/huimv/admin/service/impl/BillPcrServiceImpl.java

@@ -196,23 +196,28 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     billPcr.setCheckDate(sdf.parse(date));
                     billPcr.setPassDate(sdf.parse(sdf.format(new Date())));
                     baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
-                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
-                    baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
+
                     String status = baseProcess.getCurrentStatus();
                     String substring = status.substring(0, status.length() - 1);
 
-                    baseProcess.setCurrentStatus(substring + "2");
+                    baseProcess.setCurrentStatus(substring + "2,"+0);
                     if (baseLocation.getId() == 2) {
                         //第一次检测不合格
                         billPcr.setPcrType(1);
+                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation()+",初级洗消站污区");
+                        baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId()+",2");
                     }
                     if (baseLocation.getId() == 6) {
                         //第二次检测不合格
                         baseProcess.setProcessType(2);
+                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
+                        baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
                     }
                     if (baseLocation.getId() == 11) {
                         //第三次不合格
                         baseProcess.setProcessType(2);
+                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
+                        baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
                     }
 
                     processMapper.updateById(baseProcess);
@@ -267,7 +272,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
                     String status = baseProcess.getCurrentStatus();
                     String substring = status.substring(0, status.length() - 1);
-                    baseProcess.setCurrentStatus(substring + "2");
+                    baseProcess.setCurrentStatus(substring + "2,"+0);
 
                     billPcr.setBillStatus(2);
                     billPcr.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));

huimv-admin/src/main/java/com/huimv/admin/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -558,7 +558,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
                 baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getNextId());
             }
-            if (billIsolate.getIsolateLocationId() == 8) {
+            if (billIsolate.getIsolateLocationId() == 8 && baseProcess.getDestId() >= 10) {
                 //通过生成洗消记录
                 BillClean billClean = new BillClean();
                 billClean.setVistitType(billIsolate.getVistitType());
@@ -615,7 +615,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getNextId());
             }
 
-            if (billIsolate.getIsolateLocationId() == 8) {
+            if (billIsolate.getIsolateLocationId() == 8 && baseProcess.getDestId() >= 10) {
                 //通过生成洗消记录
                 BillClean billClean = new BillClean();
                 billClean.setVistitType(billIsolate.getVistitType());