From 4a2475b53bcbf38a8649c2ad27eab47d451d1976 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 12 Jul 2016 15:12:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 66 +++++++++++++++++----- .../platform/operate/web/facade/PatientFacade.java | 4 ++ 2 files changed, 56 insertions(+), 14 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 34c3a24..466e9ca 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 @@ -58,18 +58,18 @@ public class AntenatalExaminationFacade { * @param antExAddRequest * @return */ - public BaseResponse addOneAntEx(AntExAddRequest antExAddRequest,Integer userId) { + public BaseResponse addOneAntEx(AntExAddRequest antExAddRequest, Integer userId) { if (StringUtils.isNotEmpty(antExAddRequest.getId())) { AntenatalExaminationModel antenatalExamination = antExAddRequest.convertToDataModel(); - antenatalExamination.setHospitalId(autoMatchFacade.matchOrgId(userId).get(0)+""); + antenatalExamination.setHospitalId(autoMatchFacade.matchOrgId(userId).get(0) + ""); antenatalExaminationService.updateOneAnt(antenatalExamination, antExAddRequest.getId()); updateApplyOrder(antenatalExamination, antExAddRequest.getParentId()); } else { AntenatalExaminationModel model = antExAddRequest.convertToDataModel(); model.setYn(YnEnums.YES.getId()); - List list1 = autoMatchFacade.matchOrgId(userId); - if(CollectionUtils.isNotEmpty(list1)){ - model.setHospitalId(list1.get(0)+""); + List list1 = autoMatchFacade.matchOrgId(userId); + if (CollectionUtils.isNotEmpty(list1)) { + model.setHospitalId(list1.get(0) + ""); } antenatalExaminationService.addOneBabyAnt(model); updateApplyOrder(model, antExAddRequest.getParentId()); @@ -100,14 +100,14 @@ public class AntenatalExaminationFacade { * @param excAddRequest * @return */ - public BaseResponse addOneAnetExChu(AntExcAddRequest excAddRequest,Integer userId) { + public BaseResponse addOneAnetExChu(AntExcAddRequest excAddRequest, Integer userId) { AntExChuModel antExChuModel = excAddRequest.convertToDataModel(); if (StringUtils.isNotEmpty(antExChuModel.getId()) && StringUtils.isNotEmpty(antExChuModel.getParentId())) { antenatalExaminationService.updateAntExChu(antExChuModel, antExChuModel.getId()); } else { - List list1 = autoMatchFacade.matchOrgId(userId); - if(CollectionUtils.isNotEmpty(list1)){ - antExChuModel.setHospitalId(list1.get(0)+""); + List list1 = autoMatchFacade.matchOrgId(userId); + if (CollectionUtils.isNotEmpty(list1)) { + antExChuModel.setHospitalId(list1.get(0) + ""); } antExChuModel.setYn(YnEnums.YES.getId()); antenatalExaminationService.addOneAntEx(antExChuModel); @@ -116,6 +116,44 @@ public class AntenatalExaminationFacade { } /** + * 获取最后一次高危产检的高危信息 + * + * 先取复诊最后一条，在取初诊 + * + * @return + */ + private List findLastRisk(String parentId) { + List list = antenatalExaminationService.findAllByParentId(parentId); + AntenatalExaminationModel model = null; + if (CollectionUtils.isNotEmpty(list)) { + model = list.get(0); + } + try { + if(null!=model){ + List list1 = JsonUtil.toList(model.getRiskFactor(), List.class); + return queryRisk(list1); + } + } catch (Exception e) { + } + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setParentId(parentId); + antExChuQuery.setYn(YnEnums.YES.getId()); + List list1 = antenatalExaminationService.queryAntExChu(antExChuQuery); + AntExChuModel antExChuModel = null; + if (CollectionUtils.isNotEmpty(list1)) { + antExChuModel = list1.get(0); + } + try { + if(null!=antExChuModel){ + List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); + return queryRisk(list2); + } + } catch (Exception e) { + } + return Collections.emptyList(); + } + + /** * 查询产妇所有产检的数据 * * @param exListQueryRequest @@ -160,8 +198,8 @@ public class AntenatalExaminationFacade { List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(antExChuModels)) { for (AntExChuModel an : antExChuModels) { - organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); - data.add(new AntData(an,null != organization ? organization.getName() : "")); + organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); + data.add(new AntData(an, null != organization ? organization.getName() : "")); } } //复诊记录 @@ -174,7 +212,7 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(list1)) { for (AntenatalExaminationModel an : list1) { organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); - data.add(new AntData(an,null != organization ? organization.getName() : "")); + data.add(new AntData(an, null != organization ? organization.getName() : "")); } } postReviewQuery = new PostReviewQuery(); @@ -192,14 +230,14 @@ public class AntenatalExaminationFacade { //分娩记录 if (CollectionUtils.isNotEmpty(modelList)) { organization = organizationService.getOrganization(Integer.valueOf(modelList.get(0).getHospitalId())); - data.add(new AntData(modelList.get(0), patients.getLastMenses(),null != organization ? organization.getName() : "")); + data.add(new AntData(modelList.get(0), patients.getLastMenses(), null != organization ? organization.getName() : "")); } //产后复查记录 List reviewModels = postReviewService.findWithList(postReviewQuery); if (CollectionUtils.isNotEmpty(reviewModels)) { for (PostReviewModel postReviewModel : reviewModels) { organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); - data.add(new AntData(postReviewModel,null != organization ? organization.getName() : "")); + data.add(new AntData(postReviewModel, null != organization ? organization.getName() : "")); } } listDate.add(data); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index b8d1b37..8682162 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -52,6 +52,8 @@ public class PatientFacade { @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; + + /** * 修改产妇的社区 * @@ -241,6 +243,8 @@ public class PatientFacade { return new BaseObjectResponse().setData(patientBaseResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); } + + /** * 转成全部产妇的返回数据 * -- 1.8.3.1