liquanyu / regional-platform

Download as
Browse Code »

Commit 3887d8b8692d6009b2ba645dbb3db64c081c6805

Authored by yangfei
1 parent 11ab85dc01
Exists in master and in 1 other branch dev

查询初诊和复诊是自定义值为null的bug

Showing 1 changed file with 27 additions and 17 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ 3887d8b
... ... @@ -60,12 +60,18 @@
60 60 this.mHighRiskReason = mHighRiskReason;
61 61 }
62 62  
63   - /** 处理意见 */
  63 + /**
  64 + * 处理意见
  65 + */
64 66 private Map<String, List<Map<String, Object>>> treatmentOpinion2;
65 67 private List<String> treatmentOpinion2Types;
66   - /** 胎动 */
  68 + /**
  69 + * 胎动
  70 + */
67 71 private String quicken;
68   - /** 胎动备注 */
  72 + /**
  73 + * 胎动备注
  74 + */
69 75 private String quickenRemark;
70 76  
71 77 public String getQuicken() {
... ... @@ -99,6 +105,7 @@
99 105 public void setTreatmentOpinion2Types(List<String> treatmentOpinion2Types) {
100 106 this.treatmentOpinion2Types = treatmentOpinion2Types;
101 107 }
  108 +
102 109 private String barCode;
103 110  
104 111 public String getBarCode() {
... ... @@ -641,7 +648,6 @@
641 648 }
642 649  
643 650  
644   -
645 651 public String getBld() {
646 652 return bld;
647 653 }
... ... @@ -804,7 +810,6 @@
804 810 }
805 811  
806 812  
807   -
808 813 public String getNcgOther() {
809 814 return ncgOther;
810 815 }
... ... @@ -1353,8 +1358,8 @@
1353 1358 setYsfyHistory(JsonUtil.str2Obj(antExChuModel.getYsfyHistory(), Map.class));
1354 1359 } catch (Exception e) {
1355 1360 }
1356   - if(null!=antExChuModel.getBp()){
1357   - setBp(JsonUtil.str2Obj(antExChuModel.getBp(),Map.class));
  1361 + if (null != antExChuModel.getBp()) {
  1362 + setBp(JsonUtil.str2Obj(antExChuModel.getBp(), Map.class));
1358 1363 }
1359 1364 setYaowu(antExChuModel.getYaowu());
1360 1365 setGongwaiyun(antExChuModel.getGongwaiyun());
1361 1366  
... ... @@ -1395,14 +1400,14 @@
1395 1400 setPlacentas(antExChuModel.getPlacentas());
1396 1401 setHighriskSocre(antExChuModel.getHighriskSocre());
1397 1402 //处理成支持多选操作
1398   - if (StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk())&& !"[]".equals(antExChuModel.getOtherHighRisk())) {
  1403 + if (StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) {
1399 1404 if (antExChuModel.getOtherHighRisk().startsWith("[") && antExChuModel.getOtherHighRisk().endsWith("]")) {
1400 1405 List<Map> list2 = JsonUtil.toList(antExChuModel.getOtherHighRisk(), Map.class);
1401 1406 for (Map map : list2) {
1402 1407 suppleOtherHigh(map);
1403 1408 }
1404 1409 setOtherHighRisk(list2);
1405   - }else{
  1410 + } else {
1406 1411 Map map = JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class);
1407 1412 suppleOtherHigh(map);
1408 1413 setOtherHighRisk(Arrays.asList(new Object[]{map}));
1409 1414  
... ... @@ -1413,10 +1418,10 @@
1413 1418 setTreatOpinion(antExChuModel.getTreatOpinion());
1414 1419 setGuide(antExChuModel.getDirOpinion());
1415 1420 // setProdDoctor(antExChuModel.getProdDoctor());
1416   - if(null!=antExChuModel.getCheckTime()){
  1421 + if (null != antExChuModel.getCheckTime()) {
1417 1422 setCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime()));
1418 1423 }
1419   - if(null!=antExChuModel.getNextCheckTime()){
  1424 + if (null != antExChuModel.getNextCheckTime()) {
1420 1425 setNextCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getNextCheckTime()));
1421 1426 }
1422 1427 setSyjg(antExChuModel.getSyjg());
1423 1428  
... ... @@ -1450,12 +1455,12 @@
1450 1455 setHivkt(antExChuModel.getHivkt());
1451 1456 setYdfmw(JsonUtil.str2Obj(antExChuModel.getYdfmw(), Map.class));
1452 1457 setYdqjd(antExChuModel.getYdqjd());
1453   - if(null!=antExChuModel.getDueDate()){
  1458 + if (null != antExChuModel.getDueDate()) {
1454 1459 setDueDate(DateUtil.getyyyy_MM_dd(antExChuModel.getDueDate()));
1455 1460 }
1456   - if(null!=antExChuModel.getLastMenses()) {
1457   - setLastMenses(DateUtil.getyyyy_MM_dd(antExChuModel.getLastMenses()));
1458   - }
  1461 + if (null != antExChuModel.getLastMenses()) {
  1462 + setLastMenses(DateUtil.getyyyy_MM_dd(antExChuModel.getLastMenses()));
  1463 + }
1459 1464 setcDueWeek(antExChuModel.getcDueWeek());
1460 1465  
1461 1466 setAbortionZR(antExChuModel.getAbortionZR());
1462 1467  
1463 1468  
1464 1469  
... ... @@ -1473,18 +1478,23 @@
1473 1478  
1474 1479 /**
1475 1480 * 完善自定义高危的颜色值，和分数值
  1481 + *
1476 1482 * @param map
1477 1483 */
1478   - public void suppleOtherHigh(Map map){
1479   - if(map!=null){
  1484 + public void suppleOtherHigh(Map map) {
  1485 + if (map != null) {
1480 1486 Object idObj1 = map.get("fyyse");
1481 1487 if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) {
1482 1488 map.put("color", HosptialHighRiskFacade.colorMap.get(idObj1));
  1489 + }else{
  1490 + map.remove("fyyse");
1483 1491 }
1484 1492 //风险评分
1485 1493 Object idObj = map.get("fxpf");
1486 1494 if (null != idObj && !"null".equals(idObj.toString()) && !"".equals(idObj.toString())) {
1487 1495 map.put("scoer", HosptialHighRiskFacade.scoreMap.get(idObj));
  1496 + }else{
  1497 + map.remove("fxpf");
1488 1498 }
1489 1499 }
1490 1500 }