From 8da901c0d39c4dd76d9cfeb370d7eaca957aeb61 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 11 Jan 2017 18:13:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?= =?UTF-8?q?=E6=A3=80=E5=8A=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 59 +++------------------- 1 file changed, 6 insertions(+), 53 deletions(-) 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 e030e13..c0221e3 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 @@ -412,9 +412,11 @@ public class AntenatalExaminationFacade { //初诊,修改产检管理 // antenatalExaminationService.updateAntExRecord(antExChuModel.getId(), 1); - if (StringUtils.isNotEmpty(antExChuModel.getPid())) { + /* if (StringUtils.isNotEmpty(antExChuModel.getPid())) { recordService.handExRecord(antExChuModel.getPid()); - } + }*/ + antenatalExaminationService.updateAntExRecord(antExChuModel.getId(), 1); + } else { AntExChuQuery antExChuQuery1 = new AntExChuQuery(); antExChuQuery1.setParentId(excAddRequest.getParentId()); @@ -472,9 +474,8 @@ public class AntenatalExaminationFacade { //修改本院最后一次定义高危 updateLastRhTime(patients.getId(), hospitalId); setLashCTimes(antExChuModel.getParentId()); - if (StringUtils.isNotEmpty(antExChuModel.getPid())) { - recordService.handExRecord(antExChuModel.getPid()); - } + + antenatalExaminationService.updateAntExRecord(antExChuModel.getId(), 1); if (null != patients.getBuildType() && patients.getBuildType() == 3) { Patients patients1 = new Patients(); patients1.setEnable("1"); @@ -1491,27 +1492,6 @@ public class AntenatalExaminationFacade { parentId = localAntModel.getParentId(); - /*AntExQuery antExQuery = new AntExQuery(); - antExQuery.setId(antExQueryRequest.getId()); - antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setHospitalId(hospital); - List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); - //TODO 需要根据时间去查询是否是本院最后一条记录 - if (CollectionUtils.isNotEmpty(list)) { - antExQuery.setStart(new Date(list.get(0).getCheckDate().getTime() + 40000)); - antExQuery.setParentId(list.get(0).getParentId()); - } - antExQuery.setId(null); - list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); - if (CollectionUtils.isNotEmpty(list)) { - for (int i = 0; i < list.size(); i++) { - if (list.get(i).getId().equals(antExQueryRequest.getId())) { - list.remove(i); - } - } - }*/ - -// if (CollectionUtils.isEmpty(list)) { if (deleteProcessHandler.deleteAntEx(localAntModel.getPid(), localAntModel.getCheckDate(), hospital, true)) { antenatalExaminationService.updateOneAnt(antEx, antExQueryRequest.getId()); @@ -1536,33 +1516,6 @@ public class AntenatalExaminationFacade { parentId = antExChuModel11.getParentId(); - - /*AntExChuQuery antExQuery = new AntExChuQuery(); - antExQuery.setId(antExQueryRequest.getId()); - antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setHospitalId(hospital); - - List list = antenatalExaminationService.queryAntExChu(antExQuery); - - //TODO 需要根据时间去查询是否是本院最后一条记录 - if (CollectionUtils.isNotEmpty(list)) { - antExQuery.setStart(new Date(list.get(0).getCheckTime().getTime() + 40000)); - antExQuery.setParentId(list.get(0).getParentId()); - } - - antExQuery.setId(null); - - list = antenatalExaminationService.queryAntExChu(antExQuery); - - if (CollectionUtils.isNotEmpty(list)) { - for (int i = 0; i < list.size(); i++) { - if (list.get(i).getId().equals(antExQueryRequest.getId())) { - list.remove(i); - } - } - }*/ - -// if (CollectionUtils.isEmpty(list)) { if (deleteProcessHandler.deleteAntExChu(antExChuModel11.getPid(), antExChuModel11.getCheckTime(), hospital, true, antExQueryRequest.getId())) { antenatalExaminationService.updateAntExChu(antExChuModel, antExQueryRequest.getId()); -- 1.8.3.1