From 718e92397c0d53f46ea7d06e124f590eaec08981 Mon Sep 17 00:00:00 2001 From: "[wangbo]" Date: Mon, 19 Aug 2019 10:12:22 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/MeasureInfoFacade.java | 2 +- .../platform/operate/web/facade/ViewFacade.java | 72 ++++++++++++++++------ 2 files changed, 55 insertions(+), 19 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java index f9ffe71..431c349 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java @@ -1471,7 +1471,7 @@ public class MeasureInfoFacade { mother.put("motherCardNo", buildModel.getMommyCertificateNum()); mother.put("motherPhone", buildModel.getMommyPhone()); mother.put("motherName", buildModel.getMommyName()); - mother.put("motherAge", com.lyms.platform.common.utils.StringUtils.getBirthDay(buildModel.getMommyCertificateNum())); + mother.put("motherAge", DateUtil.getAge(com.lyms.platform.common.utils.StringUtils.getBirthDay(buildModel.getMommyCertificateNum()))); Map map = new HashMap(); if (response.getErrorcode() == 0) { map.put("id", response.getData().toString()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 1e4e308..5031024 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -6050,46 +6050,82 @@ public class ViewFacade { map.put("fuh", antenatalExaminationModel.getGongGao()); //腹围 map.put("abdominalCircumference", antenatalExaminationModel.getAbdominalCircumference()); - //默认值 - map.put("heartRate", ""); - map.put("fetalPosition", ""); - map.put("fetalPresentation", ""); - map.put("join", ""); + /*//默认值 + List list = new ArrayList(); + List list1 = new ArrayList(); + List list2 = new ArrayList(); + List list3 = new ArrayList(); if (CollectionUtils.isNotEmpty(antenatalExaminationModel.getTireData())) { // String heartRateVal = "", fetalPositionVal = "", fetalPresentationVal = "", joinVal = ""; for (int j = 0; j < antenatalExaminationModel.getTireData().size(); j++) { LinkedHashMap maps = (LinkedHashMap) antenatalExaminationModel.getTireData().get(j); if (null != maps) { + //胎先露、胎方位、胎心率和衔接 - String heartRate = String.valueOf(map.get("heartRate")); - String fetalPosition = String.valueOf(map.get("fetalPosition")); - String fetalPresentation = String.valueOf(map.get("fetalPresentation")); - String join = String.valueOf(map.get("join")); + String heartRate = String.valueOf(maps.get("heartRate")); + System.out.println("========>" + heartRate); + String fetalPosition = String.valueOf(maps.get("fetalPosition")); + String fetalPresentation = String.valueOf(maps.get("fetalPresentation")); + String join = String.valueOf(maps.get("join")); if (!"null".equals(heartRate) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(heartRate)) { //胎心率 - map.put("heartRate", antenatalExaminationModel.getTireData()); - + // map.put("heartRate", heartRate); + list.add(heartRate); // heartRateVal += heartRate + "次/分" + ","; } if (!"null".equals(fetalPosition) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(fetalPosition)) { //胎方位 - map.put("fetalPosition", fetalPosition); + // map.put("fetalPosition", fetalPosition); + + list1.add(fetalPosition); // fetalPositionVal += FetalPositionEnums.getTitle(fetalPosition) + ","; } if (!"null".equals(fetalPresentation) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(fetalPresentation)) { //胎先露 - map.put("fetalPresentation", fetalPresentation); + // map.put("fetalPresentation", fetalPresentation); + list2.add(fetalPresentation); } // fetalPresentationVal += FetalEnums.getTitle(fetalPresentation) + ","; if (!"null".equals(join) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(join)) { // joinVal += JoinEnums.getTitle(join) + ","; //衔接 - map.put("join", join); + // map.put("join", join); + list3.add(join); + } + } + } + } + map.put("heartRate", list); + map.put("fetalPosition", list1); + map.put("fetalPresentation", list2); + map.put("join", list3);*/ + //胎儿情况 + + List tireList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(antenatalExaminationModel.getTireData())) { + for (Object temp : antenatalExaminationModel.getTireData()) { + Map tire = (Map) temp; + if (tire != null) { + String heartRate = tire.get("heartRate") == null ? "" : String.valueOf(tire.get("heartRate")); + String fetalPosition = tire.get("fetalPosition") + ""; + String fetalPresentation = tire.get("fetalPresentation") + ""; + String join = tire.get("join") + ""; + + Map tireMap = new HashMap<>(); + if (StringUtils.isNotEmpty(heartRate)) { + tireMap.put("heartRate", UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN)); + } else { + tireMap.put("heartRate", ""); } + tireMap.put("fetalPosition", FetalPositionEnums.getTitle(fetalPosition)); + tireMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation)); + tireMap.put("join", JoinEnums.getTitle(join)); + tireList.add(tireMap); } } } + map.put("tireData", tireList); //浮肿 map.put("edema", antenatalExaminationModel.getEdema()); //血红蛋白 @@ -6123,16 +6159,16 @@ public class ViewFacade { if (NumberUtils.isNumber(antenatalExaminationModel.getCheckDoctor())) { Users users = usersService.getUsers(NumberUtils.toInt(antenatalExaminationModel.getCheckDoctor())); if (null != users) { - map.put("DoctorName", users.getName()); + map.put("doctorName", users.getName()); } else { - map.put("DoctorName", antenatalExaminationModel.getCheckDoctor()); + map.put("doctorName", antenatalExaminationModel.getCheckDoctor()); } } else { - map.put("DoctorName", antenatalExaminationModel.getCheckDoctor()); + map.put("dnoctorName", antenatalExaminationModel.getCheckDoctor()); } } //下次检查日期 - map.put("NextCheckDate", DateUtil.getyyyy_MM_dd(antenatalExaminationModel.getNextCheckTime())); + map.put("nextCheckDate", DateUtil.getyyyy_MM_dd(antenatalExaminationModel.getNextCheckTime())); } data.add(map); } -- 1.8.3.1