From 4aa5dd39f41096780ece0bdcdb56fa63f6ba27bd Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 5 Sep 2016 17:49:29 +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 --- .../web/facade/AntenatalExaminationFacade.java | 48 +++++++++++++--------- 1 file changed, 29 insertions(+), 19 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 d406663..724bdd6 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 @@ -174,7 +174,7 @@ public class AntenatalExaminationFacade { antExChuQuery1.setParentId(excAddRequest.getParentId()); List data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1); //初诊只能建一次 - if(CollectionUtils.isEmpty(data1)){ + if (CollectionUtils.isEmpty(data1)) { Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setPid(patients.getPid()); @@ -229,7 +229,7 @@ public class AntenatalExaminationFacade { applyOrderService.updateByParentId(referralApplyOrderQuery2, model); } } - }else{ + } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("您已经做过初诊"); } } @@ -268,6 +268,11 @@ public class AntenatalExaminationFacade { patientsService.updatePatient(patients); if (!list.isEmpty()) { Patients patients1 = new Patients(); + try { + List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); + patients1.setRiskFactorId(list2); + } catch (Exception e) { + } patients1.setRiskLevelId(JsonUtil.array2JsonString(list)); patients1.setModified(new Date()); PatientsQuery patientsQuery = new PatientsQuery(); @@ -307,6 +312,11 @@ public class AntenatalExaminationFacade { patientsService.updatePatient(patients); if (!list.isEmpty()) { Patients patients1 = new Patients(); + try { + List list2 = JsonUtil.toList(antExChuModel.getRiskFactor(), List.class); + patients1.setRiskFactorId(list2); + } catch (Exception e) { + } patients1.setModified(new Date()); patients1.setRiskLevelId(JsonUtil.array2JsonString(list)); PatientsQuery patientsQuery = new PatientsQuery(); @@ -596,7 +606,7 @@ public class AntenatalExaminationFacade { Date dueDate = new Date(); if (CollectionUtils.isNotEmpty(listDate)) { String pid = ""; - int count = 0; + int count = 0; for (int i = 0; i < listDate.size(); i++) { dueDate = listDate.get(i).getDate(); Date end = new Date(listDate.get(i).getDate().getTime() + 86398000); @@ -612,9 +622,9 @@ public class AntenatalExaminationFacade { } pid = list.get(0).getPid(); patientsQuery1.setPid(pid); - List patientses = patientsService.queryPatient1(patientsQuery1,"created"); + List patientses = patientsService.queryPatient1(patientsQuery1, "created"); if (CollectionUtils.isNotEmpty(patientses)) { - count=count+patientses.size(); + count = count + patientses.size(); Iterator iterator = patientses.iterator(); while (iterator.hasNext()) { Patients patients = iterator.next(); @@ -634,7 +644,7 @@ public class AntenatalExaminationFacade { PostReviewQuery postReviewQuery = new PostReviewQuery(); if (list.size() - 1 > i) { postReviewQuery.setStart(dueDate); - if(CollectionUtils.isNotEmpty(patientses)){ + if (CollectionUtils.isNotEmpty(patientses)) { //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示 postReviewQuery.setEnd(patientses.get(0).getBookbuildingDate()); } @@ -649,7 +659,7 @@ public class AntenatalExaminationFacade { if (null != postReviewModel.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); } - listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size()-1).getFmDate())); + listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size() - 1).getFmDate())); } } sortList.add(listData); @@ -681,9 +691,9 @@ public class AntenatalExaminationFacade { postReviewQuery.setPid(pid); Object obj = map.get(listDate.get(i).getId()); if (obj instanceof MaternalDeliverModel) { - listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : "")); + listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : "")); } else if (obj instanceof StopPregModel) { - listData.add(new AntData(stopPregs.get(0), patientses.get(0).getLastMenses(), null != organization ? organization.getName() : "")); + listData.add(new AntData(stopPregs.get(0), patientses.get(0).getLastMenses(), null != organization ? organization.getName() : "")); } //产后复查记录 @@ -693,7 +703,7 @@ public class AntenatalExaminationFacade { if (null != postReviewModel.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); } - listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size()-1).getFmDate())); + listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size() - 1).getFmDate())); } } } @@ -703,7 +713,7 @@ public class AntenatalExaminationFacade { Collections.reverse(sortList); } } - if(list.size()>count){ + if (list.size() > count) { //分娩记录剩下的建档 PatientsQuery patientsQuery1 = new PatientsQuery(); patientsQuery1.setYn(YnEnums.YES.getId()); @@ -1047,29 +1057,29 @@ public class AntenatalExaminationFacade { * @param antExQueryRequest * @return */ - public BaseResponse delOneAntEx(AntExQueryRequest antExQueryRequest,Integer userId) { + public BaseResponse delOneAntEx(AntExQueryRequest antExQueryRequest, Integer userId) { if ("1".equals(antExQueryRequest.getType())) { AntenatalExaminationModel antEx = new AntenatalExaminationModel(); antEx.setYn(YnEnums.NO.getId()); antEx.setId(antExQueryRequest.getId()); String hospital = autoMatchFacade.getHospitalId(userId); - AntExQuery antExQuery=new AntExQuery(); + AntExQuery antExQuery = new AntExQuery(); antExQuery.setId(antExQueryRequest.getId()); antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setHospitalId(hospital); - List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); //TODO 需要根据时间去查询是否是本院最后一条记录 - if(CollectionUtils.isNotEmpty(list)){ - antExQuery.setStart(new Date(list.get(0).getCheckDate().getTime()+40000)); + if (CollectionUtils.isNotEmpty(list)) { + antExQuery.setStart(new Date(list.get(0).getCheckDate().getTime() + 40000)); } antExQuery.setId(null); - list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); - if(CollectionUtils.isEmpty(list)){ + if (CollectionUtils.isEmpty(list)) { antenatalExaminationService.updateOneAnt(antEx, antExQueryRequest.getId()); - }else{ + } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("当前产检记录不是本院最新的产检记录,不能删除"); } } else { -- 1.8.3.1