diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java index 37af2a3..6b9af26 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java @@ -50,6 +50,7 @@ public class ApplyOrderService { // return iReferralApplyOrderDao.queryList(babyQuery.convertToQuery()); } public SieveApplyOrderModel addOneSieveApplyOrder(SieveApplyOrderModel obj){ + obj.setStatus(0); return iSieveApplyOrderDao.addApplyOrder(obj); } public List querySieveApplyOrderWithQuery(SieveApplyOrderQuery sieveApplyOrderQuery){ diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index a3626e7..cc38750 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -16,6 +16,7 @@ import com.lyms.platform.pojo.SieveModel; import com.lyms.platform.query.AntExQuery; import com.lyms.platform.query.PatientsQuery; import com.lyms.platform.query.SieveApplyOrderQuery; +import com.lyms.platform.query.SieveQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; @@ -126,19 +127,20 @@ public class PatientsService { List idList = new ArrayList<>(); for (SieveApplyOrderModel orderModel : list) { if (null != orderModel.getParentId()) { - Patients patients= iPatientDao.getPatient(orderModel.getId()); - if(null!=patients){ + Patients patients = iPatientDao.getPatient(orderModel.getId()); + if (null != patients) { SieveModel sieveModel = convertToModel(patients); sieveDao.addChanQianSieve(sieveModel); } idList.add(orderModel.getId()); } } - SieveApplyOrderModel sieveApplyOrderModel=new SieveApplyOrderModel(); + SieveApplyOrderModel sieveApplyOrderModel = new SieveApplyOrderModel(); sieveApplyOrderModel.setStatus(1); - for(String str:idList){ + for (String str : idList) { sieveApplyOrderModel.setId(str); sieveApplyOrderModel.setModified(new Date()); + sieveApplyOrderModel.setStatus(1); iSieveApplyOrderDao.updateSieve(sieveApplyOrderModel); } } @@ -181,9 +183,15 @@ public class PatientsService { @Override public void run() { LogUtil.taskInfo("add sieve PatientWorker job :" + getName() + " start."); + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); for (Patients patient : patientses) { - SieveModel sieveModel = convertToModel(patient); - sieveDao.addChanQianSieve(sieveModel); + sieveQuery.setParentId(patient.getId()); + List list = sieveDao.queryList(sieveQuery.convertToQuery()); + if (CollectionUtils.isEmpty(list)) { + SieveModel sieveModel = convertToModel(patient); + sieveDao.addChanQianSieve(sieveModel); + } } LogUtil.taskInfo("add sieve PatientWorker job :" + getName() + " end.costTime :" + (System.currentTimeMillis() - startTime) + " ms."); } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java index a1d072a..2502305 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java @@ -22,7 +22,7 @@ public class SieveApplyOrderModel { private String checkDate; //申请医生 private String applyDoctor; - //标识是否同步过数据 + //标识是否同步过数据 0 表示未同步 1表示已同步 private Integer status; private Integer yn;