jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4034aca895e7c5af173095b9b7c13fab1adca5a1

Authored by yangfei
1 parent 930ab08e9d
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

查询号bug修改

Showing 2 changed files with 15 additions and 14 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java View file @ 4034aca
... ... @@ -163,6 +163,7 @@
163 163 }
164 164 return data;
165 165 } catch (Exception e) {
  166 + e.printStackTrace();
166 167 return null;
167 168 }
168 169 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 4034aca
... ... @@ -1177,7 +1177,7 @@
1177 1177 }
1178 1178  
1179 1179 if ("java.util.LinkedHashMap".equals(obj.getClass().getName())) {
1180   - Map<String, String> placenta = JsonUtil.getMap(obj.toString());
  1180 + Map<String, Object> placenta = (Map<String, Object>)obj;
1181 1181 if (MapUtils.isNotEmpty(placenta)) {
1182 1182 if (placenta.get("fetalPosition") != null) {
1183 1183 for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) {
1184 1184  
1185 1185  
1186 1186  
1187 1187  
1188 1188  
... ... @@ -1193,25 +1193,25 @@
1193 1193 heartRate = String.valueOf(a);
1194 1194 }
1195 1195 fetalPresentation += placenta.get("fetalPresentation") == null ? "" : placenta.get("fetalPresentation");
1196   - join = placenta.get("join");
  1196 + join = String.valueOf(placenta.get("join"));
1197 1197  
1198   - if (StringUtils.isNotEmpty(placenta.get("xlwz"))) {
1199   - placetaMap.put("xlwz", GongJingEnums.getXLWeiZhiNameById(placenta.get("xlwz")));
  1198 + if (placenta.get("xlwz")!=null) {
  1199 + placetaMap.put("xlwz", GongJingEnums.getXLWeiZhiNameById(String.valueOf(placenta.get("xlwz"))));
1200 1200 }
1201   - if (StringUtils.isNotEmpty(placenta.get("gjwz"))) {
1202   - placetaMap.put("gjwz", GongJingEnums.getWeiZhiNameById(placenta.get("gjwz")));
  1201 + if (placenta.get("gjwz")!=null) {
  1202 + placetaMap.put("gjwz", GongJingEnums.getWeiZhiNameById(String.valueOf(placenta.get("gjwz"))));
1203 1203 }
1204 1204  
1205   - if (StringUtils.isNotEmpty(placenta.get("gjyd"))) {
1206   - placetaMap.put("gjyd", GongJingEnums.getYinDuNameById(placenta.get("gjyd")));
  1205 + if (placenta.get("gjyd")!=null) {
  1206 + placetaMap.put("gjyd", GongJingEnums.getYinDuNameById(String.valueOf(placenta.get("gjyd"))));
1207 1207 }
1208 1208  
1209   - if (StringUtils.isNotEmpty(placenta.get("ydjc"))) {
1210   - placetaMap.put("tm", TaiShuEnums.getTmNameById(placenta.get("ydjc")));
  1209 + if (placenta.get("tm")!=null) {
  1210 + placetaMap.put("tm", TaiShuEnums.getTmNameById(String.valueOf(placenta.get("tm"))));
1211 1211 }
1212 1212  
1213   - if (StringUtils.isNotEmpty(placenta.get("ydjc"))) {
1214   - placetaMap.put("ydjc", GongJingEnums.getYDJianCeNameById(placenta.get("ydjc")));
  1213 + if (placenta.get("ydjc")!=null) {
  1214 + placetaMap.put("ydjc", GongJingEnums.getYDJianCeNameById(String.valueOf(placenta.get("ydjc"))));
1215 1215 }
1216 1216  
1217 1217 if (placenta.get("gjkd") != null) {
1218 1218  
... ... @@ -1222,11 +1222,11 @@
1222 1222 placetaMap.put("gjrs", UnitUtils.unitSplice(placenta.get("gjrs"), UnitConstants.BF));
1223 1223 }
1224 1224  
1225   - if (StringUtils.isNotEmpty(placenta.get("gjwzOther"))) {
  1225 + if (placenta.get("gjwzOther")!=null) {
1226 1226 placetaMap.put("gjwzOther", placenta.get("gjwzOther "));
1227 1227 }
1228 1228  
1229   - if (StringUtils.isNotEmpty(placenta.get("gjydOther"))) {
  1229 + if (placenta.get("gjydOther")!=null) {
1230 1230 placetaMap.put("gjydOther", placenta.get("gjydOther"));
1231 1231 }
1232 1232