隔离和洗消手机号添加

huimv-admin/src/main/java/com/huimv/admin/entity/BillClean.java

@@ -107,5 +107,5 @@ public class BillClean implements Serializable {
 
     private Integer testLocationId;
 
-
+    private String phone;
 }

huimv-admin/src/main/java/com/huimv/admin/entity/BillIsolate.java

@@ -135,5 +135,6 @@ public class BillIsolate implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private Date isolateRealEndDate;
 
+    private String phone;
 
 }

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

@@ -131,6 +131,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         //生成pcr检测申请
                         BillPcr billPcr = new BillPcr();
                         billPcr.setPcrType(0);
+                        billPcr.setPhone(billClean.getPhone());
                         billPcr.setVistitType(billClean.getVistitType());
                         billPcr.setDestName(billClean.getDestName());
                         billPcr.setDestId(billClean.getDestId());
@@ -148,6 +149,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     if (baseLocation.getId() == 7 || baseLocation.getId() == 12) {
                         //生成隔离申请
                         BillIsolate isolate = new BillIsolate();
+                        isolate.setPhone(billClean.getPhone());
                         isolate.setVistitType(billClean.getVistitType());
                         isolate.setDestName(billClean.getDestName());
                         isolate.setDestId(billClean.getDestId());

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

@@ -158,6 +158,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     billClean.setProcessId(billPcr.getProcessId());
                     billClean.setTestLocation(baseLocation.getNextLocation());
                     billClean.setTestLocationId(baseLocation.getNextId());
+                    billClean.setPhone(billPcr.getPhone());
                     cleanMapper.insert(billClean);
 
                     baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));

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

@@ -364,6 +364,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
                     //通过生成洗消记录
                     BillClean billClean = new BillClean();
+                    billClean.setPhone(billPcr.getPhone());
                     billClean.setVistitType(billPcr.getVistitType());
                     billClean.setDestName(billPcr.getDestName());
                     billClean.setDestId(billPcr.getDestId());