Commit 718e92397c0d53f46ea7d06e124f590eaec08981
1 parent
e31c8e626d
Exists in
master
and in
6 other branches
bug修改
Showing 2 changed files with 55 additions and 19 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
View file @
718e923
| ... | ... | @@ -1471,7 +1471,7 @@ |
| 1471 | 1471 | mother.put("motherCardNo", buildModel.getMommyCertificateNum()); |
| 1472 | 1472 | mother.put("motherPhone", buildModel.getMommyPhone()); |
| 1473 | 1473 | mother.put("motherName", buildModel.getMommyName()); |
| 1474 | - mother.put("motherAge", com.lyms.platform.common.utils.StringUtils.getBirthDay(buildModel.getMommyCertificateNum())); | |
| 1474 | + mother.put("motherAge", DateUtil.getAge(com.lyms.platform.common.utils.StringUtils.getBirthDay(buildModel.getMommyCertificateNum()))); | |
| 1475 | 1475 | Map map = new HashMap(); |
| 1476 | 1476 | if (response.getErrorcode() == 0) { |
| 1477 | 1477 | map.put("id", response.getData().toString()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
718e923
| ... | ... | @@ -6050,46 +6050,82 @@ |
| 6050 | 6050 | map.put("fuh", antenatalExaminationModel.getGongGao()); |
| 6051 | 6051 | //腹围 |
| 6052 | 6052 | map.put("abdominalCircumference", antenatalExaminationModel.getAbdominalCircumference()); |
| 6053 | - //默认值 | |
| 6054 | - map.put("heartRate", ""); | |
| 6055 | - map.put("fetalPosition", ""); | |
| 6056 | - map.put("fetalPresentation", ""); | |
| 6057 | - map.put("join", ""); | |
| 6053 | + /*//默认值 | |
| 6054 | + List list = new ArrayList(); | |
| 6055 | + List list1 = new ArrayList(); | |
| 6056 | + List list2 = new ArrayList(); | |
| 6057 | + List list3 = new ArrayList(); | |
| 6058 | 6058 | if (CollectionUtils.isNotEmpty(antenatalExaminationModel.getTireData())) { |
| 6059 | 6059 | // String heartRateVal = "", fetalPositionVal = "", fetalPresentationVal = "", joinVal = ""; |
| 6060 | 6060 | for (int j = 0; j < antenatalExaminationModel.getTireData().size(); j++) { |
| 6061 | 6061 | LinkedHashMap maps = (LinkedHashMap) antenatalExaminationModel.getTireData().get(j); |
| 6062 | 6062 | if (null != maps) { |
| 6063 | + | |
| 6063 | 6064 | //胎先露、胎方位、胎心率和衔接 |
| 6064 | - String heartRate = String.valueOf(map.get("heartRate")); | |
| 6065 | - String fetalPosition = String.valueOf(map.get("fetalPosition")); | |
| 6066 | - String fetalPresentation = String.valueOf(map.get("fetalPresentation")); | |
| 6067 | - String join = String.valueOf(map.get("join")); | |
| 6065 | + String heartRate = String.valueOf(maps.get("heartRate")); | |
| 6066 | + System.out.println("========>" + heartRate); | |
| 6067 | + String fetalPosition = String.valueOf(maps.get("fetalPosition")); | |
| 6068 | + String fetalPresentation = String.valueOf(maps.get("fetalPresentation")); | |
| 6069 | + String join = String.valueOf(maps.get("join")); | |
| 6068 | 6070 | if (!"null".equals(heartRate) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(heartRate)) { |
| 6069 | 6071 | //胎心率 |
| 6070 | - map.put("heartRate", antenatalExaminationModel.getTireData()); | |
| 6071 | - | |
| 6072 | + // map.put("heartRate", heartRate); | |
| 6073 | + list.add(heartRate); | |
| 6072 | 6074 | // heartRateVal += heartRate + "次/分" + ","; |
| 6073 | 6075 | } |
| 6074 | 6076 | if (!"null".equals(fetalPosition) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(fetalPosition)) { |
| 6075 | 6077 | //胎方位 |
| 6076 | - map.put("fetalPosition", fetalPosition); | |
| 6078 | + // map.put("fetalPosition", fetalPosition); | |
| 6079 | + | |
| 6080 | + list1.add(fetalPosition); | |
| 6077 | 6081 | // fetalPositionVal += FetalPositionEnums.getTitle(fetalPosition) + ","; |
| 6078 | 6082 | } |
| 6079 | 6083 | if (!"null".equals(fetalPresentation) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(fetalPresentation)) { |
| 6080 | 6084 | //胎先露 |
| 6081 | - map.put("fetalPresentation", fetalPresentation); | |
| 6085 | + // map.put("fetalPresentation", fetalPresentation); | |
| 6086 | + list2.add(fetalPresentation); | |
| 6082 | 6087 | } |
| 6083 | 6088 | // fetalPresentationVal += FetalEnums.getTitle(fetalPresentation) + ","; |
| 6084 | 6089 | |
| 6085 | 6090 | if (!"null".equals(join) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(join)) { |
| 6086 | 6091 | // joinVal += JoinEnums.getTitle(join) + ","; |
| 6087 | 6092 | //衔接 |
| 6088 | - map.put("join", join); | |
| 6093 | + // map.put("join", join); | |
| 6094 | + list3.add(join); | |
| 6089 | 6095 | } |
| 6090 | 6096 | } |
| 6091 | 6097 | } |
| 6092 | 6098 | } |
| 6099 | + map.put("heartRate", list); | |
| 6100 | + map.put("fetalPosition", list1); | |
| 6101 | + map.put("fetalPresentation", list2); | |
| 6102 | + map.put("join", list3);*/ | |
| 6103 | + //胎儿情况 | |
| 6104 | + | |
| 6105 | + List<Map> tireList = new ArrayList<>(); | |
| 6106 | + if (CollectionUtils.isNotEmpty(antenatalExaminationModel.getTireData())) { | |
| 6107 | + for (Object temp : antenatalExaminationModel.getTireData()) { | |
| 6108 | + Map<String, Object> tire = (Map<String, Object>) temp; | |
| 6109 | + if (tire != null) { | |
| 6110 | + String heartRate = tire.get("heartRate") == null ? "" : String.valueOf(tire.get("heartRate")); | |
| 6111 | + String fetalPosition = tire.get("fetalPosition") + ""; | |
| 6112 | + String fetalPresentation = tire.get("fetalPresentation") + ""; | |
| 6113 | + String join = tire.get("join") + ""; | |
| 6114 | + | |
| 6115 | + Map<String, Object> tireMap = new HashMap<>(); | |
| 6116 | + if (StringUtils.isNotEmpty(heartRate)) { | |
| 6117 | + tireMap.put("heartRate", UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN)); | |
| 6118 | + } else { | |
| 6119 | + tireMap.put("heartRate", ""); | |
| 6120 | + } | |
| 6121 | + tireMap.put("fetalPosition", FetalPositionEnums.getTitle(fetalPosition)); | |
| 6122 | + tireMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation)); | |
| 6123 | + tireMap.put("join", JoinEnums.getTitle(join)); | |
| 6124 | + tireList.add(tireMap); | |
| 6125 | + } | |
| 6126 | + } | |
| 6127 | + } | |
| 6128 | + map.put("tireData", tireList); | |
| 6093 | 6129 | //浮肿 |
| 6094 | 6130 | map.put("edema", antenatalExaminationModel.getEdema()); |
| 6095 | 6131 | //血红蛋白 |
| 6096 | 6132 | |
| 6097 | 6133 | |
| 6098 | 6134 | |
| ... | ... | @@ -6123,16 +6159,16 @@ |
| 6123 | 6159 | if (NumberUtils.isNumber(antenatalExaminationModel.getCheckDoctor())) { |
| 6124 | 6160 | Users users = usersService.getUsers(NumberUtils.toInt(antenatalExaminationModel.getCheckDoctor())); |
| 6125 | 6161 | if (null != users) { |
| 6126 | - map.put("DoctorName", users.getName()); | |
| 6162 | + map.put("doctorName", users.getName()); | |
| 6127 | 6163 | } else { |
| 6128 | - map.put("DoctorName", antenatalExaminationModel.getCheckDoctor()); | |
| 6164 | + map.put("doctorName", antenatalExaminationModel.getCheckDoctor()); | |
| 6129 | 6165 | } |
| 6130 | 6166 | } else { |
| 6131 | - map.put("DoctorName", antenatalExaminationModel.getCheckDoctor()); | |
| 6167 | + map.put("dnoctorName", antenatalExaminationModel.getCheckDoctor()); | |
| 6132 | 6168 | } |
| 6133 | 6169 | } |
| 6134 | 6170 | //下次检查日期 |
| 6135 | - map.put("NextCheckDate", DateUtil.getyyyy_MM_dd(antenatalExaminationModel.getNextCheckTime())); | |
| 6171 | + map.put("nextCheckDate", DateUtil.getyyyy_MM_dd(antenatalExaminationModel.getNextCheckTime())); | |
| 6136 | 6172 | } |
| 6137 | 6173 | data.add(map); |
| 6138 | 6174 | } |