jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9c409e1b576a80ec090265a74bc1aa06727c71c4

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

查询号bug修改

Showing 1 changed file with 41 additions and 39 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 9c409e1
... ... @@ -428,10 +428,15 @@
428 428 map.put("hPhone", patients.getHusbandPhone());
429 429 }
430 430  
431   -
432   - map.put("yNum", data.getPregnancyTimes());
433   - map.put("fNum", data.getDelivery());
434   - map.put("pNum", data.getPlanedProd());
  431 + if (data.getPregnancyTimes() != null) {
  432 + map.put("yNum", data.getPregnancyTimes());
  433 + }
  434 + if (data.getDelivery() != null) {
  435 + map.put("fNum", data.getDelivery());
  436 + }
  437 + if (data.getPlanedProd() != null) {
  438 + map.put("pNum", data.getPlanedProd());
  439 + }
435 440 if (data.getLastMenses() != null) {
436 441 Calendar lastCal = Calendar.getInstance();
437 442 lastCal.setTime(data.getLastMenses());
... ... @@ -944,12 +949,12 @@
944 949 /* 初诊信息 */
945 950  
946 951  
947   - map.put("zyqbdjc", Boolean.valueOf(data.getZyqbd())?"已检查":"未检查");
948   - map.put("ntjc", Boolean.valueOf(data.getNtjc())?"已检查":"未检查");
949   - map.put("cjsc", Boolean.valueOf(data.getCjsc())?"已检查":"未检查");
950   - map.put("textpjbc", Boolean.valueOf(data.getTextpjbc())?"已检查":"未检查");
951   - map.put("s75gdgtt",Boolean.valueOf( data.getS75gdgtt())?"已检查":"未检查");
952   - map.put("jzxgn", Boolean.valueOf(data.getJzxgn())?"已检查":"未检查");
  952 + map.put("zyqbdjc", Boolean.valueOf(data.getZyqbd()) ? "已检查" : "未检查");
  953 + map.put("ntjc", Boolean.valueOf(data.getNtjc()) ? "已检查" : "未检查");
  954 + map.put("cjsc", Boolean.valueOf(data.getCjsc()) ? "已检查" : "未检查");
  955 + map.put("textpjbc", Boolean.valueOf(data.getTextpjbc()) ? "已检查" : "未检查");
  956 + map.put("s75gdgtt", Boolean.valueOf(data.getS75gdgtt()) ? "已检查" : "未检查");
  957 + map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查");
953 958 //既往史
954 959 String pastHistory = "";
955 960 if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getPastHistory())) {
956 961  
... ... @@ -1027,13 +1032,11 @@
1027 1032 map.put("gongwaiyun", UnitUtils.unitSplice(data.getGongwaiyun(), UnitConstants.CI));
1028 1033 //流产
1029 1034 StringBuffer abortion = new StringBuffer();
1030   - if (data.getAbortion() != null)
1031   - {
  1035 + if (data.getAbortion() != null) {
1032 1036 boolean isAppend = false;
1033 1037 abortion.append(UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI) == null ? "" : UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI));
1034   - if (data.getAbortionZR() != null || data.getAbortionRG() != null || data.getYaowu() != null)
1035   - {
1036   - isAppend = true;
  1038 + if (data.getAbortionZR() != null || data.getAbortionRG() != null || data.getYaowu() != null) {
  1039 + isAppend = true;
1037 1040 abortion.append("（");
1038 1041 }
1039 1042 if (data.getAbortionZR() != null) {
... ... @@ -1047,8 +1050,7 @@
1047 1050 if (data.getYaowu() != null) {
1048 1051 abortion.append(" 药物:" + data.getYaowu() + UnitConstants.CI + "");
1049 1052 }
1050   - if (isAppend)
1051   - {
  1053 + if (isAppend) {
1052 1054 abortion.append("）");
1053 1055 }
1054 1056  
... ... @@ -1171,7 +1173,7 @@
1171 1173 }
1172 1174  
1173 1175 if ("java.util.LinkedHashMap".equals(obj.getClass().getName())) {
1174   - Map<String, Object> placenta = (Map<String, Object>)obj;
  1176 + Map<String, Object> placenta = (Map<String, Object>) obj;
1175 1177 if (MapUtils.isNotEmpty(placenta)) {
1176 1178 if (placenta.get("fetalPosition") != null) {
1177 1179 for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) {
1178 1180  
1179 1181  
1180 1182  
1181 1183  
... ... @@ -1189,22 +1191,22 @@
1189 1191 fetalPresentation += placenta.get("fetalPresentation") == null ? "" : placenta.get("fetalPresentation");
1190 1192 join = String.valueOf(placenta.get("join"));
1191 1193  
1192   - if (placenta.get("xlwz")!=null) {
  1194 + if (placenta.get("xlwz") != null) {
1193 1195 placetaMap.put("xlwz", GongJingEnums.getXLWeiZhiNameById(String.valueOf(placenta.get("xlwz"))));
1194 1196 }
1195   - if (placenta.get("gjwz")!=null) {
  1197 + if (placenta.get("gjwz") != null) {
1196 1198 placetaMap.put("gjwz", GongJingEnums.getWeiZhiNameById(String.valueOf(placenta.get("gjwz"))));
1197 1199 }
1198 1200  
1199   - if (placenta.get("gjyd")!=null) {
  1201 + if (placenta.get("gjyd") != null) {
1200 1202 placetaMap.put("gjyd", GongJingEnums.getYinDuNameById(String.valueOf(placenta.get("gjyd"))));
1201 1203 }
1202 1204  
1203   - if (placenta.get("tm")!=null) {
  1205 + if (placenta.get("tm") != null) {
1204 1206 placetaMap.put("tm", TaiShuEnums.getTmNameById(String.valueOf(placenta.get("tm"))));
1205 1207 }
1206 1208  
1207   - if (placenta.get("ydjc")!=null) {
  1209 + if (placenta.get("ydjc") != null) {
1208 1210 placetaMap.put("ydjc", GongJingEnums.getYDJianCeNameById(String.valueOf(placenta.get("ydjc"))));
1209 1211 }
1210 1212  
1211 1213  
... ... @@ -1216,11 +1218,11 @@
1216 1218 placetaMap.put("gjrs", UnitUtils.unitSplice(placenta.get("gjrs"), UnitConstants.BF));
1217 1219 }
1218 1220  
1219   - if (placenta.get("gjwzOther")!=null) {
  1221 + if (placenta.get("gjwzOther") != null) {
1220 1222 placetaMap.put("gjwzOther", placenta.get("gjwzOther"));
1221 1223 }
1222 1224  
1223   - if (placenta.get("gjydOther")!=null) {
  1225 + if (placenta.get("gjydOther") != null) {
1224 1226 placetaMap.put("gjydOther", placenta.get("gjydOther"));
1225 1227 }
1226 1228  
... ... @@ -1275,7 +1277,7 @@
1275 1277 map.put("syjg", FunvCommonUtil.checkYiGan(data.getSyjg()));
1276 1278 map.put("hivkt", FunvCommonUtil.checkYiGan(data.getHivkt()));
1277 1279  
1278   - map.put("cjzxs",data.getCjzxs());//促甲状腺素
  1280 + map.put("cjzxs", data.getCjzxs());//促甲状腺素
1279 1281 map.put("yljzxs", data.getYljzxs());//游离甲状腺素
1280 1282 map.put("jzxgyhwmkt", data.getJzxgyhwmkt());//甲状腺过氧化物酶抗体
1281 1283  
... ... @@ -1399,12 +1401,12 @@
1399 1401 map.put("checkDate", DateUtil.getyyyy_MM_dd(data.getCheckDate()));
1400 1402 map.put("currentDueDate", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckDate()));
1401 1403  
1402   - map.put("zyqbdjc", Boolean.valueOf(data.getZyqbd())?"已检查":"未检查");
1403   - map.put("ntjc", Boolean.valueOf(data.getNtjc())?"已检查":"未检查");
1404   - map.put("cjsc", Boolean.valueOf(data.getCjsc())?"已检查":"未检查");
1405   - map.put("textpjbc", Boolean.valueOf(data.getTextpjbc())?"已检查":"未检查");
1406   - map.put("s75gdgtt",Boolean.valueOf( data.getS75gdgtt())?"已检查":"未检查");
1407   - map.put("jzxgn", Boolean.valueOf(data.getJzxgn())?"已检查":"未检查");
  1404 + map.put("zyqbdjc", Boolean.valueOf(data.getZyqbd()) ? "已检查" : "未检查");
  1405 + map.put("ntjc", Boolean.valueOf(data.getNtjc()) ? "已检查" : "未检查");
  1406 + map.put("cjsc", Boolean.valueOf(data.getCjsc()) ? "已检查" : "未检查");
  1407 + map.put("textpjbc", Boolean.valueOf(data.getTextpjbc()) ? "已检查" : "未检查");
  1408 + map.put("s75gdgtt", Boolean.valueOf(data.getS75gdgtt()) ? "已检查" : "未检查");
  1409 + map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查");
1408 1410  
1409 1411 //早孕期病毒检测
1410 1412 // private String zyqbdjc;
1411 1413  
1412 1414  
1413 1415  
1414 1416  
... ... @@ -1495,22 +1497,22 @@
1495 1497 tireMap.put("fetalPosition", FetalPositionEnums.getTitle(fetalPosition));
1496 1498 tireMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation));
1497 1499 tireMap.put("join", JoinEnums.getTitle(join));
1498   - if (tire.get("xlwz")!=null) {
  1500 + if (tire.get("xlwz") != null) {
1499 1501 tireMap.put("xlwz", GongJingEnums.getXLWeiZhiNameById(String.valueOf(tire.get("xlwz"))));
1500 1502 }
1501   - if (tire.get("gjwz")!=null) {
  1503 + if (tire.get("gjwz") != null) {
1502 1504 tireMap.put("gjwz", GongJingEnums.getWeiZhiNameById(String.valueOf(tire.get("gjwz"))));
1503 1505 }
1504 1506  
1505   - if (tire.get("gjyd")!=null) {
  1507 + if (tire.get("gjyd") != null) {
1506 1508 tireMap.put("gjyd", GongJingEnums.getYinDuNameById(String.valueOf(tire.get("gjyd"))));
1507 1509 }
1508 1510  
1509   - if (tire.get("tm")!=null) {
  1511 + if (tire.get("tm") != null) {
1510 1512 tireMap.put("tm", TaiShuEnums.getTmNameById(String.valueOf(tire.get("tm"))));
1511 1513 }
1512 1514  
1513   - if (tire.get("ydjc")!=null) {
  1515 + if (tire.get("ydjc") != null) {
1514 1516 tireMap.put("ydjc", GongJingEnums.getYDJianCeNameById(String.valueOf(tire.get("ydjc"))));
1515 1517 }
1516 1518  
1517 1519  
... ... @@ -1522,11 +1524,11 @@
1522 1524 tireMap.put("gjrs", UnitUtils.unitSplice(tire.get("gjrs"), UnitConstants.BF));
1523 1525 }
1524 1526  
1525   - if (tire.get("gjwzOther")!=null) {
  1527 + if (tire.get("gjwzOther") != null) {
1526 1528 tireMap.put("gjwzOther", tire.get("gjwzOther"));
1527 1529 }
1528 1530  
1529   - if (tire.get("gjydOther")!=null) {
  1531 + if (tire.get("gjydOther") != null) {
1530 1532 tireMap.put("gjydOther", tire.get("gjydOther"));
1531 1533 }
1532 1534