From d3271bd8567ce849f3a65479832fc553c525cfad Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 27 Jun 2018 14:01:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/facade/RiskReportFacade.java | 2 ++ .../main/java/com/lyms/platform/operate/web/facade/SieveFacade.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index 319143c..6f2d767 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -120,6 +120,8 @@ public class RiskReportFacade { basicConfigQuery.setParentId(SystemConfig.BABY_WEAK_SON_ID); } else return null; + // System.out.println(query.convertToQuery().convertToMongoQuery()); + int riskPatientCount = babyService.queryBabyCount(query); // int allPatientCount = babyService.queryBabyCount(babyModelQuery); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index f2e6871..7b511ea 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -1022,6 +1022,8 @@ public class SieveFacade { if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { Map result = new HashMap<>(); SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0); + String hostName = CommonsHelper.getHospitalName(sieveApply.getSieveHospitalId(), organizationService); + result.put("reportHostName",hostName); result.put("patientInfo", patientBaseResult); result.put("weight", sieveApply.getWeight()); result.put("lastMenstr", DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses())); @@ -1036,6 +1038,7 @@ public class SieveFacade { result.put("pastHistory",sieveApply.getPastHistory()); String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(), usersService); result.put("cxys", collectionDoctorName); + result.put("experimentNum",""); String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(), usersService); result.put("sjys", sendDoctorName); -- 1.8.3.1