From a574a42e9a5eed6184cb141005c6da4c8528c1c1 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 23 Aug 2016 10:34:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/biz/service/PatientsService.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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 58ec3cd..ca016f2 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 @@ -14,6 +14,7 @@ import com.lyms.platform.pojo.Patients; 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; @@ -36,7 +37,8 @@ public class PatientsService { private IPatientDao iPatientDao; @Autowired private ISieveDao sieveDao; - + @Autowired + private ISieveApplyOrderDao sieveApplyOrderDao; public Patients addPatient(Patients obj) { return iPatientDao.addPatient(obj); } @@ -159,14 +161,19 @@ public class PatientsService { public void delSieve(){ SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setYn(YnEnums.YES.getId()); - sieveQuery.setFrom("0"); Date endDate = DateUtil.addDay(new Date(), -146); sieveQuery.setLastMensesStart(endDate); List list = sieveDao.queryList(sieveQuery.convertToQuery()); if(CollectionUtils.isNotEmpty(list)){ for(SieveModel sieveModel:list) { - sieveModel.setYn(YnEnums.NO.getId()); - sieveDao.updateChanQianSieve(sieveModel); + SieveApplyOrderQuery sieveApplyOrderQuery=new SieveApplyOrderQuery(); + sieveApplyOrderQuery.setParentId(sieveModel.getParentId()); + sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); + List list1 = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery()); + if(CollectionUtils.isEmpty(list1)){ + sieveModel.setYn(YnEnums.NO.getId()); + sieveDao.updateChanQianSieve(sieveModel); + } } } } -- 1.8.3.1