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 07b3327..06213a7 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 @@ -397,6 +397,21 @@ public class PatientsService { if (CollectionUtils.isEmpty(list)) { SieveModel sieveModel = convertToModel(patient); sieveModel.setFrom("0"); + SieveApplyOrderQuery sieveApplyOrderQuery=new SieveApplyOrderQuery(); + sieveApplyOrderQuery.setParentId(patient.getId()); + sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); + List orders = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery()); + if(CollectionUtils.isNotEmpty(orders)){ + sieveModel.setStatus(SieveStatusEnums.O1.getId()); + + SieveResultQuery sieveResultQuery=new SieveResultQuery(); + sieveResultQuery.setParentId(patient.getId()); + sieveResultQuery.setYn(YnEnums.YES.getId()); + List result= sieveDao.queryListSieveResult(sieveResultQuery.convertToQuery()); + if(CollectionUtils.isNotEmpty(result)){ + sieveModel.setStatus(SieveStatusEnums.O2.getId()); + } + } SieveService.handOrder(sieveModel); sieveDao.addChanQianSieve(sieveModel); }