From b5546ca24299410abe1b8ff6ee21bc2d274a71d0 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 4 Jun 2019 11:16:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E9=AB=98=E5=8D=B1=E5=9B=A0?= =?UTF-8?q?=E7=B4=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/model/LisReportItemModel.java | 10 +++++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 10 +++++++++ .../platform/operate/web/facade/PatientFacade.java | 24 ++++++++++++++++++---- 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportItemModel.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportItemModel.java index 95c4cba..9126d90 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportItemModel.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportItemModel.java @@ -13,6 +13,8 @@ public class LisReportItemModel { // 项目名称 private String name; // 项目结果 + private String result2; + // 项目结果 private String result; // 高低标志 private String resultFlag; @@ -138,6 +140,14 @@ public class LisReportItemModel { this.printOrder = printOrder; } + public String getResult2() { + return result2; + } + + public void setResult2(String result2) { + this.result2 = result2; + } + @Override public String toString() { return "ListReportItemModel [lisId=" + lisId + ", code=" diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 1962cea..c2708c6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1310,6 +1310,16 @@ public class BabyBookbuildingFacade { BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id); List patientSerResults = (List) baseResponse.getObject(); result.setPatientSerResults(patientSerResults); + + if (!isBuild && StringUtils.isNotEmpty(model.getParentId())) + { + Patients patients = patientsService.findOnePatientById(model.getParentId()); + if (patients != null) + { + List> riskList = mongoUtil.findColor(patients.getRiskFactorId()); + result.setmHighRiskReason(riskList); + } + } } /** 优惠券编号 */ 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 e4a2981..b2df9ed 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 @@ -1353,6 +1353,15 @@ public class PatientFacade { patientsQuery.setLimit(patientManagerRequest.getLimit()); patientsQuery.setPage(patientManagerRequest.getPage()); } + + if (null != patientManagerRequest.getStartAge() && null != patientManagerRequest.getEndAge()) { + Date start = DateUtil.getBeforeAge(patientManagerRequest.getStartAge()); + Date end = DateUtil.getBeforeAge(patientManagerRequest.getEndAge()); + patientsQuery.setStartAge(start); + patientsQuery.setEndAge(end); + } + + //排查本院隐藏建档 patientsQuery.setExtEnable(false); patientsQuery.setBuildTypeNot(1); @@ -1488,6 +1497,14 @@ public class PatientFacade { patientsQuery.setLimit(patientManagerRequest.getLimit()); patientsQuery.setPage(patientManagerRequest.getPage()); } + + if (null != patientManagerRequest.getStartAge() && null != patientManagerRequest.getEndAge()) { + Date start = DateUtil.getBeforeAge(patientManagerRequest.getStartAge()); + Date end = DateUtil.getBeforeAge(patientManagerRequest.getEndAge()); + patientsQuery.setStartAge(start); + patientsQuery.setEndAge(end); + } + //排查本院隐藏建档 patientsQuery.setExtEnable(false); patientsQuery.setBuildTypeNot(1); @@ -1544,10 +1561,9 @@ public class PatientFacade { AntExChuQuery antExChuQuery = new AntExChuQuery();//获取初诊记录 antExChuQuery.setParentId(patients.getId()); List antExChulist = antExService.queryAntExChu(antExChuQuery); - if(antExChulist.size()!=0){ - AntExChuModel data = antExService.findOne(antExChulist.get(0).getId()); - Integer prodTime= data.getProdTime()+ 1; - healthHandbookExcelModel.setChildTime(data == null ? "" : (data.getProdTime() == null ? "" : prodTime.toString())); + if(CollectionUtils.isNotEmpty(antExChulist)){ + AntExChuModel data = antExChulist.get(0); + healthHandbookExcelModel.setChildTime(data == null ? "" : (data.getProdTime() == null ? "" : data.getProdTime().toString())); }else { healthHandbookExcelModel.setChildTime(""); } -- 1.8.3.1