From b0b1cf423f431bad277cbca4fe74bbbc6f03b6eb Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 16 Nov 2016 11:47:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E8=AF=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/service/PatientsService.java | 30 ++++++++++++++-------- 1 file changed, 19 insertions(+), 11 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 4b736c7..e005534 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 @@ -176,7 +176,7 @@ public class PatientsService { sieveApplyOrderQuery.setParentId(sieveModel.getParentId()); sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); List list1 = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery()); - if (CollectionUtils.isEmpty(list1)&&StringUtils.isEmpty(sieveModel.getCsRemarkTypeId())) { + if (CollectionUtils.isEmpty(list1) && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId())) { sieveModel.setYn(YnEnums.NO.getId()); sieveDao.updateChanQianSieve(sieveModel); } @@ -264,7 +264,13 @@ public class PatientsService { sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); sieveApplyOrderQuery.setHospitalId(patients.getHospitalId()); List list1 = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery()); - if (CollectionUtils.isEmpty(list1)) { + + SieveQuery sieveQuery1 = new SieveQuery(); + sieveQuery1.setYn(YnEnums.YES.getId()); + sieveQuery1.setParentId(patients.getId()); + List list12 = sieveDao.queryList(sieveQuery1.convertToQuery()); + + if (CollectionUtils.isEmpty(list1) && CollectionUtils.isNotEmpty(list12) && StringUtils.isEmpty(list12.get(0).getCsRemarkTypeId())) { //修改孕妇末次月经不满足条件删除产筛数据 SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setYn(YnEnums.YES.getId()); @@ -275,16 +281,18 @@ public class PatientsService { sieveQuery.setYn(YnEnums.YES.getId()); sieveQuery.setParentId(patients.getId()); List list = sieveDao.queryList(sieveQuery.convertToQuery()); - //修改孕妇基本信息 - for (SieveModel sieveModel : list) { - sieveModel.setPhone(patients.getPhone()); - sieveModel.setName(patients.getUsername()); - sieveModel.setLastMenses(patients.getLastMenses()); - sieveModel.setCardNo(patients.getCardNo()); - if (null != sieveModel.getDueWeek()) { - sieveModel.setDueWeek(days); + if (CollectionUtils.isNotEmpty(list)) { + //修改孕妇基本信息 + for (SieveModel sieveModel : list) { + sieveModel.setPhone(patients.getPhone()); + sieveModel.setName(patients.getUsername()); + sieveModel.setLastMenses(patients.getLastMenses()); + sieveModel.setCardNo(patients.getCardNo()); + if (null != sieveModel.getDueWeek()) { + sieveModel.setDueWeek(days); + } + sieveDao.updateChanQianSieve(sieveModel); } - sieveDao.updateChanQianSieve(sieveModel); } } } -- 1.8.3.1