Commit 71bc17bde92d41cf8a0f19e289bf79cac7e620df
1 parent
922bb27af9
Exists in
master
bug
Showing 2 changed files with 17 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
71bc17b
| ... | ... | @@ -1063,7 +1063,7 @@ |
| 1063 | 1063 | childbirthManagerQueryModel.setPatientId(patients.getId()); |
| 1064 | 1064 | childbirthManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId()); |
| 1065 | 1065 | // 居住地 |
| 1066 | - if (childbirthManagerRequest.getInitQuery().contains("address")) { | |
| 1066 | + if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())&&childbirthManagerRequest.getInitQuery().contains("address")) { | |
| 1067 | 1067 | childbirthManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); |
| 1068 | 1068 | } |
| 1069 | 1069 | // 电话转换 |
| ... | ... | @@ -1072,7 +1072,7 @@ |
| 1072 | 1072 | // 加密身份证号 |
| 1073 | 1073 | childbirthManagerQueryModel.setCardNo(DefenceUtils.getId(patients.getCardNo())); |
| 1074 | 1074 | // 查询分娩方式 |
| 1075 | - if (childbirthManagerRequest.getInitQuery().contains("deliveryMode")) { | |
| 1075 | + if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())&&childbirthManagerRequest.getInitQuery().contains("deliveryMode")) { | |
| 1076 | 1076 | String deliveryModeJson = maternalDeliverModel.getDeliveryMode(); |
| 1077 | 1077 | Map<String, String> deliveryModeMap = JsonUtil.getMap(deliveryModeJson); |
| 1078 | 1078 | if (MapUtils.isNotEmpty(deliveryModeMap) && StringUtils.isNotEmpty(deliveryModeMap.get("fmfs"))) { |
| ... | ... | @@ -1087,7 +1087,7 @@ |
| 1087 | 1087 | } |
| 1088 | 1088 | } |
| 1089 | 1089 | // 产妇情况 |
| 1090 | - if (childbirthManagerRequest.getInitQuery().contains("maternalInfo")) { | |
| 1090 | + if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())&&childbirthManagerRequest.getInitQuery().contains("maternalInfo")) { | |
| 1091 | 1091 | if (StringUtils.isNotBlank(maternalDeliverModel.getMaternalInfo())) { |
| 1092 | 1092 | for (CfEnums cfEnums : CfEnums.values()) { |
| 1093 | 1093 | if (cfEnums.getId().equals(maternalDeliverModel.getMaternalInfo())) { |
| ... | ... | @@ -1099,7 +1099,7 @@ |
| 1099 | 1099 | } |
| 1100 | 1100 | // 查询接生医生 |
| 1101 | 1101 | try { |
| 1102 | - if (childbirthManagerRequest.getInitQuery().contains("deliverDoctor")) { | |
| 1102 | + if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())&&childbirthManagerRequest.getInitQuery().contains("deliverDoctor")) { | |
| 1103 | 1103 | childbirthManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName()); |
| 1104 | 1104 | } |
| 1105 | 1105 | } catch (Exception e) { |
| ... | ... | @@ -1107,7 +1107,7 @@ |
| 1107 | 1107 | } |
| 1108 | 1108 | childbirthManagerQueryModel.setAge(DateUtil.getAge(patients.getBirth())); |
| 1109 | 1109 | // 查询活产数 |
| 1110 | - if (childbirthManagerRequest.getInitQuery().contains("livingNumber")) { | |
| 1110 | + if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())&&childbirthManagerRequest.getInitQuery().contains("livingNumber")) { | |
| 1111 | 1111 | BabyModelQuery babyModelQuery = new BabyModelQuery(); |
| 1112 | 1112 | babyModelQuery.setYn(YnEnums.YES.getId()); |
| 1113 | 1113 | babyModelQuery.setParentId(patients.getId()); |
| ... | ... | @@ -1189,7 +1189,7 @@ |
| 1189 | 1189 | |
| 1190 | 1190 | // 开始拼装自定义查询结果 |
| 1191 | 1191 | // 胎方位，胎心率，胎先露 |
| 1192 | - if (childbirthManagerRequest.getInitQuery().contains("fetalPosition") || childbirthManagerRequest.getInitQuery().contains("heartRate") || childbirthManagerRequest.getInitQuery().contains("fetalPresentation")) { | |
| 1192 | + if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())&&(childbirthManagerRequest.getInitQuery().contains("fetalPosition") || childbirthManagerRequest.getInitQuery().contains("heartRate") || childbirthManagerRequest.getInitQuery().contains("fetalPresentation"))) { | |
| 1193 | 1193 | // 这个泛型不会出错，传入的就是这个 |
| 1194 | 1194 | @SuppressWarnings("unchecked") |
| 1195 | 1195 | List<MatDeliverAddRequest.Placenta> placentaList = maternalDeliverModel.getPlacentas(); |
| ... | ... | @@ -1260,7 +1260,7 @@ |
| 1260 | 1260 | childbirthManagerQueryModel.setChBpSzy1(chBpMap.get("szy")); |
| 1261 | 1261 | } |
| 1262 | 1262 | // 胎盘娩出方式，胎盘大小，胎盘重量，脐带长度，脐带是否异常，脐带异常类型 |
| 1263 | - if (childbirthManagerRequest.getInitQuery().contains("tpmcType") || childbirthManagerRequest.getInitQuery().contains("tpSize") || childbirthManagerRequest.getInitQuery().contains("tpWeight") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordLength") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordEx") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordExType")) { | |
| 1263 | + if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())&&(childbirthManagerRequest.getInitQuery().contains("tpmcType") || childbirthManagerRequest.getInitQuery().contains("tpSize") || childbirthManagerRequest.getInitQuery().contains("tpWeight") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordLength") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordEx") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordExType"))) { | |
| 1264 | 1264 | List<MaternalDeliverModel.ExtPlacenta> extPlacentaList = maternalDeliverModel.getExtPlacentas(); |
| 1265 | 1265 | if (CollectionUtils.isNotEmpty(extPlacentaList)) { |
| 1266 | 1266 | String tpmcType = ""; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java
View file @
71bc17b