From 0fb68c51944a6792256324c9fd2dd7aeeab05b2e Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 5 Dec 2016 16:28:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?= =?UTF-8?q?=E9=99=A41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/biz/service/AntExRecordService.java | 8 +++++--- .../lyms/platform/biz/service/AntenatalExaminationService.java | 1 + .../platform/operate/web/facade/AntenatalExaminationFacade.java | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java index f357dbf..82cf03c 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java @@ -102,8 +102,10 @@ public class AntExRecordService { if (StringUtils.isEmpty(parentId)) { return; } - - //先删除掉该人的 + AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery(); + antExRecordQuery1.setfId(parentId); + antExRecordDao.findAndMove(antExRecordQuery1.convertToQuery()); + /* //先删除掉该人的 AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery(); antExRecordQuery1.setParentId(parentId); antExRecordDao.findAndMove(antExRecordQuery1.convertToQuery()); @@ -145,7 +147,7 @@ public class AntExRecordService { } } } - } + }*/ } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java index 1e245a7..8e05374 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java @@ -111,6 +111,7 @@ public class AntenatalExaminationService { if (CollectionUtils.isNotEmpty(list)) { antExRecordService.batchUpdate(antExRecordModel,antExRecordQuery); } else { + antExRecordQuery.setfId(null); antExRecordQuery.setParentId(antExRecordModel.getParentId()); antExRecordQuery.setcId(antExRecordModel.getCheckDoctor()); Integer count = antExRecordService.count(antExRecordQuery); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index c2e41ff..c9d8764 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -1432,7 +1432,7 @@ public class AntenatalExaminationFacade { setLashCTimes(hospital, antenatalExaminationModel.getParentId(), 2); updateLastRisk(antenatalExaminationModel.getParentId()); - recordService.handExRecord(antenatalExaminationModel.getParentId()); + recordService.handExRecord(antenatalExaminationModel.getId()); } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("当前产检记录不是本院最新的产检记录,不能删除"); } @@ -1480,7 +1480,7 @@ public class AntenatalExaminationFacade { AntExChuModel antExChuModel1 = antenatalExaminationService.findOne(antExQueryRequest.getId()); setLashCTimes(hospital, antExChuModel1.getParentId(), 1); updateLastRisk(antExChuModel1.getParentId()); - recordService.handExRecord(antExChuModel1.getParentId()); + recordService.handExRecord(antExChuModel1.getId()); } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("当前产检记录不是本院最新的产检记录,不能删除"); } -- 1.8.3.1