Commit 9195b7e7794d804ed5496b05c06738bbeb791783
1 parent
c34193d8b6
Exists in
master
and in
1 other branch
初诊、复诊数据同步
Showing 4 changed files with 140 additions and 83 deletions
- platform-common/src/main/java/com/lyms/platform/common/constants/UnitConstants.java
- platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
- platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
platform-common/src/main/java/com/lyms/platform/common/constants/UnitConstants.java
View file @
9195b7e
platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
View file @
9195b7e
| ... | ... | @@ -150,10 +150,10 @@ |
| 150 | 150 | //血红蛋白 |
| 151 | 151 | private String hemoglobin; |
| 152 | 152 | |
| 153 | - //白细胞 | |
| 153 | + //白细胞计数 | |
| 154 | 154 | private String whiteCell; |
| 155 | 155 | |
| 156 | - //血小板 | |
| 156 | + //血小板计数 | |
| 157 | 157 | private String platelet; |
| 158 | 158 | |
| 159 | 159 | //血常规其他 |
| ... | ... | @@ -350,6 +350,7 @@ |
| 350 | 350 | //气味 |
| 351 | 351 | private String bcgQw; |
| 352 | 352 | /*****便常规***/ |
| 353 | + | |
| 353 | 354 | //维生素A |
| 354 | 355 | private String wssa; |
| 355 | 356 | //维生素D |
platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java
View file @
9195b7e
| ... | ... | @@ -233,12 +233,12 @@ |
| 233 | 233 | babyPaedia.setNerve(babyCheckModel.getNerve()); |
| 234 | 234 | babyPaedia.setKq(babyCheckModel.getKq()); |
| 235 | 235 | if (StringUtils.isNotEmpty(babyCheckModel.getCyNum())) { |
| 236 | - String kq = babyPaedia.getKq()==null?"":babyPaedia.getKq(); | |
| 236 | + String kq = babyPaedia.getKq() == null ? "" : babyPaedia.getKq(); | |
| 237 | 237 | babyPaedia.setKq(kq + " 出牙数：" + babyCheckModel.getCyNum()); |
| 238 | 238 | } |
| 239 | 239 | if (StringUtils.isNotEmpty(babyCheckModel.getQcNum())) { |
| 240 | - String kq = babyPaedia.getKq()==null?"":babyPaedia.getKq(); | |
| 241 | - babyPaedia.setKq(kq+ " 龋齿：" + babyCheckModel.getQcNum()); | |
| 240 | + String kq = babyPaedia.getKq() == null ? "" : babyPaedia.getKq(); | |
| 241 | + babyPaedia.setKq(kq + " 龋齿：" + babyCheckModel.getQcNum()); | |
| 242 | 242 | } |
| 243 | 243 | babyPaedia.setCyNum(babyCheckModel.getCyNum()); |
| 244 | 244 | babyPaedia.setQcNum(babyCheckModel.getQcNum()); |
| ... | ... | @@ -413,9 +413,9 @@ |
| 413 | 413 | babyCheckDiagnosis.setOtherText(babyCheckModel.getAskOther()); |
| 414 | 414 | |
| 415 | 415 | babyCheckDiagnosis.setCnqk(babyCheckModel.getCnqk()); |
| 416 | - babyCheckDiagnosis.setMtcnNum(babyCheckModel.getMtcnNum()); | |
| 417 | - babyCheckDiagnosis.setXbNum(babyCheckModel.getXbNum()); | |
| 418 | - babyCheckDiagnosis.setDbNum(babyCheckModel.getDbNum()); | |
| 416 | + babyCheckDiagnosis.setMtcnNum(StringUtils.unitHandle(babyCheckModel.getMtcnNum(), UnitConstants.CI)); | |
| 417 | + babyCheckDiagnosis.setXbNum(StringUtils.unitHandle(babyCheckModel.getXbNum(), UnitConstants.CI)); | |
| 418 | + babyCheckDiagnosis.setDbNum(StringUtils.unitHandle(babyCheckModel.getDbNum(), UnitConstants.CI)); | |
| 419 | 419 | babyCheckDiagnosis.setQdtlTime(com.lyms.platform.common.utils.StringUtils.unitHandle(babyCheckModel.getQdtlTime(), UnitConstants.DAY)); |
| 420 | 420 | babyCheckDiagnosis.setPfhrTime(com.lyms.platform.common.utils.StringUtils.unitHandle(babyCheckModel.getPfhrTime(), UnitConstants.DAY)); |
| 421 | 421 | babyCheckDiagnosis.setWssAd(com.lyms.platform.common.utils.StringUtils.unitHandle(babyCheckModel.getWssAd(), UnitConstants.WSSD)); |
| ... | ... | @@ -450,8 +450,8 @@ |
| 450 | 450 | babyCheckSubs.setCreated(babyCheckModel.getCreated()); |
| 451 | 451 | babyCheckSubs.setModified(babyCheckModel.getModified()); |
| 452 | 452 | babyCheckSubs.setHemoglobin(com.lyms.platform.common.utils.StringUtils.unitHandle(babyCheckModel.getHemoglobin(), UnitConstants.GL)); |
| 453 | - babyCheckSubs.setWhiteCell(babyCheckModel.getWhiteCell()); | |
| 454 | - babyCheckSubs.setPlatelet(babyCheckModel.getPlatelet()); | |
| 453 | + babyCheckSubs.setWhiteCell(StringUtils.unitHandle(babyCheckModel.getWhiteCell(), UnitConstants.TEN_LKG_MAIN)); | |
| 454 | + babyCheckSubs.setPlatelet(StringUtils.unitHandle(babyCheckModel.getPlatelet(), UnitConstants.TEN_LKG_MAIN)); | |
| 455 | 455 | babyCheckSubs.setOtherBlood(babyCheckModel.getOtherBlood()); |
| 456 | 456 | babyCheckSubs.setUrineProtein(babyCheckModel.getUrineProtein()); |
| 457 | 457 | babyCheckSubs.setUrineSugar(babyCheckModel.getUrineSugar()); |
| 458 | 458 | |
| 459 | 459 | |
| 460 | 460 | |
| ... | ... | @@ -461,48 +461,73 @@ |
| 461 | 461 | babyCheckSubs.setOtherText(babyCheckModel.getAssistCheckOther()); |
| 462 | 462 | babyCheckSubs.setXlClass(JsonUtil.obj2JsonString(babyCheckModel.getXlClass())); |
| 463 | 463 | babyCheckSubs.setXldq(babyCheckModel.getXldq()); |
| 464 | - babyCheckSubs.setNd(babyCheckModel.getNd()); | |
| 464 | + babyCheckSubs.setNd(StringUtils.unitHandle(babyCheckModel.getNd(), UnitConstants.GG)); | |
| 465 | + | |
| 466 | + babyCheckSubs.setYgbmky(FunvCommonUtil.checkYiGan(babyCheckModel.getYgbmky())); | |
| 467 | + babyCheckSubs.setYgeky(FunvCommonUtil.checkYiGan(babyCheckModel.getYgeky())); | |
| 468 | + babyCheckSubs.setYgekt(FunvCommonUtil.checkYiGan(babyCheckModel.getYgekt())); | |
| 469 | + babyCheckSubs.setYghxkt(FunvCommonUtil.checkYiGan(babyCheckModel.getYghxkt())); | |
| 470 | + babyCheckSubs.setYgbmkt(FunvCommonUtil.checkYiGan(babyCheckModel.getYgbmkt())); | |
| 471 | + | |
| 465 | 472 | babyCheckSubs.setYgbmky(babyCheckModel.getYgbmky()); |
| 466 | 473 | babyCheckSubs.setYgbmkt(babyCheckModel.getYgbmkt()); |
| 467 | 474 | babyCheckSubs.setYgeky(babyCheckModel.getYgeky()); |
| 468 | 475 | babyCheckSubs.setYgekt(babyCheckModel.getYgekt()); |
| 469 | 476 | babyCheckSubs.setYghxkt(babyCheckModel.getYghxkt()); |
| 470 | - babyCheckSubs.setWlTong(babyCheckModel.getWlTong()); | |
| 471 | - babyCheckSubs.setWlXin(babyCheckModel.getWlXin()); | |
| 472 | - babyCheckSubs.setWlGai(babyCheckModel.getWlGai()); | |
| 473 | - babyCheckSubs.setWlMei(babyCheckModel.getWlMei()); | |
| 474 | - babyCheckSubs.setWlTie(babyCheckModel.getWlTie()); | |
| 475 | - babyCheckSubs.setWlQian(babyCheckModel.getWlQian()); | |
| 476 | - babyCheckSubs.setWlGe(babyCheckModel.getWlGe()); | |
| 477 | - babyCheckSubs.setWlMeng(babyCheckModel.getWlMeng()); | |
| 478 | - babyCheckSubs.setYgbmkyNum(babyCheckModel.getYgbmkyNum()); | |
| 479 | - babyCheckSubs.setYgbmktNum(babyCheckModel.getYgbmktNum()); | |
| 480 | - babyCheckSubs.setYgekyNum(babyCheckModel.getYgekyNum()); | |
| 481 | - babyCheckSubs.setYgektNum(babyCheckModel.getYgektNum()); | |
| 482 | - babyCheckSubs.setYghxktNum(babyCheckModel.getYghxktNum()); | |
| 483 | - babyCheckSubs.setXqgbzam(babyCheckModel.getXqgbzam()); | |
| 484 | - babyCheckSubs.setXqgczam(babyCheckModel.getXqgczam()); | |
| 485 | - babyCheckSubs.setAlbumin(babyCheckModel.getAlbumin()); | |
| 486 | - babyCheckSubs.setTotalBilirubin(babyCheckModel.getTotalBilirubin()); | |
| 487 | - babyCheckSubs.setJhBilirubin(babyCheckModel.getJhBilirubin()); | |
| 477 | + | |
| 478 | + babyCheckSubs.setWlTong(StringUtils.unitHandle(babyCheckModel.getWlTong(), UnitConstants.UMOLL)); | |
| 479 | + babyCheckSubs.setWlXin(StringUtils.unitHandle(babyCheckModel.getWlXin(), UnitConstants.UMOLL)); | |
| 480 | + babyCheckSubs.setWlGai(StringUtils.unitHandle(babyCheckModel.getWlGai(), UnitConstants.UMOLL)); | |
| 481 | + babyCheckSubs.setWlMei(StringUtils.unitHandle(babyCheckModel.getWlMei(), UnitConstants.UMOLL)); | |
| 482 | + babyCheckSubs.setWlTie(StringUtils.unitHandle(babyCheckModel.getWlTie(), UnitConstants.UMOLL)); | |
| 483 | + babyCheckSubs.setWlQian(StringUtils.unitHandle(babyCheckModel.getWlQian(), UnitConstants.UMOLL)); | |
| 484 | + babyCheckSubs.setWlGe(StringUtils.unitHandle(babyCheckModel.getWlGe(), UnitConstants.UMOLL)); | |
| 485 | + babyCheckSubs.setWlMeng(StringUtils.unitHandle(babyCheckModel.getWlMeng(), UnitConstants.UMOLL)); | |
| 486 | + | |
| 487 | + babyCheckSubs.setYgbmky(FunvCommonUtil.checkYiGan(babyCheckModel.getYgbmky())); | |
| 488 | + babyCheckSubs.setYgeky(FunvCommonUtil.checkYiGan(babyCheckModel.getYgeky())); | |
| 489 | + babyCheckSubs.setYgekt(FunvCommonUtil.checkYiGan(babyCheckModel.getYgekt())); | |
| 490 | + babyCheckSubs.setYghxkt(FunvCommonUtil.checkYiGan(babyCheckModel.getYghxkt())); | |
| 491 | + babyCheckSubs.setYgbmkt(FunvCommonUtil.checkYiGan(babyCheckModel.getYgbmkt())); | |
| 492 | + | |
| 493 | + babyCheckSubs.setXqgbzam(StringUtils.unitHandle(babyCheckModel.getXqgbzam(), UnitConstants.UL)); | |
| 494 | + babyCheckSubs.setXqgczam(StringUtils.unitHandle(babyCheckModel.getXqgczam(), UnitConstants.UL)); | |
| 495 | + babyCheckSubs.setAlbumin(StringUtils.unitHandle(babyCheckModel.getAlbumin(), UnitConstants.UL)); | |
| 496 | + babyCheckSubs.setTotalBilirubin(StringUtils.unitHandle(babyCheckModel.getTotalBilirubin(), UnitConstants.UL)); | |
| 497 | + babyCheckSubs.setJhBilirubin(StringUtils.unitHandle(babyCheckModel.getJhBilirubin(), UnitConstants.UL)); | |
| 488 | 498 | babyCheckSubs.setBcgYs(babyCheckModel.getBcgYs()); |
| 489 | 499 | babyCheckSubs.setBcgXz(babyCheckModel.getBcgXz()); |
| 490 | - babyCheckSubs.setBcgHbx(babyCheckModel.getBcgHbx()); | |
| 491 | - babyCheckSubs.setBcgBxb(babyCheckModel.getBcgBxb()); | |
| 492 | - babyCheckSubs.setBcgSpxb(babyCheckModel.getBcgSpxb()); | |
| 493 | - babyCheckSubs.setBcgZlxb(babyCheckModel.getBcgZlxb()); | |
| 494 | - babyCheckSubs.setBcgDfkl(babyCheckModel.getBcgDfkl()); | |
| 495 | - babyCheckSubs.setBcgZfkl(babyCheckModel.getBcgZfkl()); | |
| 496 | - babyCheckSubs.setBcgJxw(babyCheckModel.getBcgJxw()); | |
| 497 | - babyCheckSubs.setBcgZwxw(babyCheckModel.getBcgZwxw()); | |
| 498 | - babyCheckSubs.setBcgZbj(babyCheckModel.getBcgZbj()); | |
| 499 | - babyCheckSubs.setBcgZj(babyCheckModel.getBcgZj()); | |
| 500 | - babyCheckSubs.setBcgJsc(babyCheckModel.getBcgJsc()); | |
| 501 | - babyCheckSubs.setBcgYc(babyCheckModel.getBcgYc()); | |
| 500 | + | |
| 501 | + babyCheckSubs.setBcgHbx(FunvCommonUtil.checkYiGan(babyCheckModel.getBcgHbx())); | |
| 502 | + | |
| 503 | + babyCheckSubs.setBcgBxb(FunvCommonUtil.checkYiGan(babyCheckModel.getBcgBxb())); | |
| 504 | + babyCheckSubs.setBcgSpxb(FunvCommonUtil.checkYiGan(babyCheckModel.getBcgSpxb())); | |
| 505 | + //肿瘤细胞 | |
| 506 | + babyCheckSubs.setBcgZlxb(FunvCommonUtil.checkYiGan(babyCheckModel.getBcgZlxb())); | |
| 507 | + //淀粉颗粒 | |
| 508 | + babyCheckSubs.setBcgDfkl(FunvCommonUtil.checkYiGan(babyCheckModel.getBcgDfkl())); | |
| 509 | + //脂肪颗粒 | |
| 510 | + babyCheckSubs.setBcgZfkl(FunvCommonUtil.checkYiGan(babyCheckModel.getBcgZfkl())); | |
| 511 | + //肌纤维 | |
| 512 | + babyCheckSubs.setBcgJxw(FunvCommonUtil.checkYiGan(babyCheckModel.getBcgJxw())); | |
| 513 | + //植物纤维 | |
| 514 | + babyCheckSubs.setBcgZwxw(FunvCommonUtil.checkYiGan(babyCheckModel.getBcgZwxw())); | |
| 515 | + //致病菌 | |
| 516 | + babyCheckSubs.setBcgZbj(FunvCommonUtil.checkYiGan(babyCheckModel.getBcgZbj())); | |
| 517 | + //真菌 | |
| 518 | + babyCheckSubs.setBcgZj(FunvCommonUtil.checkYiGan(babyCheckModel.getBcgZj())); | |
| 519 | + //寄生虫 | |
| 520 | + babyCheckSubs.setBcgJsc(FunvCommonUtil.checkYiGan(babyCheckModel.getBcgJsc())); | |
| 521 | + //原虫 | |
| 522 | + babyCheckSubs.setBcgYc(FunvCommonUtil.checkYiGan(babyCheckModel.getBcgYc())); | |
| 523 | + //气味 | |
| 502 | 524 | babyCheckSubs.setBcgQw(babyCheckModel.getBcgQw()); |
| 503 | - babyCheckSubs.setWssa(babyCheckModel.getWssa()); | |
| 504 | - babyCheckSubs.setJcwd(babyCheckModel.getJcwd()); | |
| 505 | - babyCheckSubs.setWsse(babyCheckModel.getWsse()); | |
| 525 | + //维生素A | |
| 526 | + babyCheckSubs.setWssa(StringUtils.unitHandle(babyCheckModel.getWssa(), UnitConstants.NG)); | |
| 527 | + //维生素D | |
| 528 | + babyCheckSubs.setJcwd(StringUtils.unitHandle(babyCheckModel.getJcwd(), UnitConstants.NG)); | |
| 529 | + //维生素E | |
| 530 | + babyCheckSubs.setWsse(StringUtils.unitHandle(babyCheckModel.getWsse(), UnitConstants.NG)); | |
| 506 | 531 | babyCheckSubs.setRzfx(JsonUtil.obj2JsonString(babyCheckModel.getRzfx())); |
| 507 | 532 | babyCheckSubs.setChatSc(JsonUtil.obj2JsonString(babyCheckModel.getChatSc())); |
| 508 | 533 | babyCheckSubs.setYyfyTest(JsonUtil.obj2JsonString(babyCheckModel.getYyfyTest())); |
| 509 | 534 | |
| ... | ... | @@ -671,13 +696,13 @@ |
| 671 | 696 | JSONObject antChuJson = new JSONObject(); |
| 672 | 697 | //月经周期 |
| 673 | 698 | String mensDay = ""; |
| 674 | - if(patients.getMensEndDay()!=null){ | |
| 699 | + if (patients.getMensEndDay() != null) { | |
| 675 | 700 | mensDay = StringUtils.unitHandle(patients.getMensStartDay(), UnitConstants.DAY); |
| 676 | 701 | } |
| 677 | 702 | |
| 678 | - if(patients.getMensEndDay()!=null){ | |
| 679 | - if(StringUtils.isNotEmpty(mensDay)){ | |
| 680 | - mensDay+=" - "; | |
| 703 | + if (patients.getMensEndDay() != null) { | |
| 704 | + if (StringUtils.isNotEmpty(mensDay)) { | |
| 705 | + mensDay += " - "; | |
| 681 | 706 | } |
| 682 | 707 | mensDay += StringUtils.unitHandle(patients.getMensEndDay(), UnitConstants.DAY); |
| 683 | 708 | } |
| 684 | 709 | |
| 685 | 710 | |
| ... | ... | @@ -699,22 +724,33 @@ |
| 699 | 724 | //产检孕周 |
| 700 | 725 | String cDueWeek = DateUtil.getPregnancyWeek(patients.getLastMenses(), antExChuModel.getCheckTime()); |
| 701 | 726 | antChuJson.put("cDueWeek", cDueWeek); |
| 702 | - int week = Integer.parseInt(cDueWeek.substring(1, cDueWeek.indexOf("周"))); | |
| 703 | - if (week >= 20) { | |
| 704 | - //宫高 | |
| 705 | - antChuJson.put("gongGao", StringUtils.unitHandle(antExChuModel.getGonggao(), UnitConstants.CM)); | |
| 706 | - } else if (week < 20) { | |
| 707 | - if (StringUtils.isNotEmpty(antExChuModel.getGonggaoSelect())) { | |
| 708 | - if (StringUtils.isNotEmpty(antExChuModel.getGonggaoType())) { | |
| 709 | - //宫高 | |
| 710 | - antChuJson.put("gongGao", GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoSelect()) + "，" + GongJingEnums.getHengZhiNameById(antExChuModel.getGonggaoType())); | |
| 711 | - } else { | |
| 712 | - //宫高 | |
| 713 | - antChuJson.put("gongGao", GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoSelect())); | |
| 714 | - } | |
| 715 | - } | |
| 727 | + // int week = Integer.parseInt(cDueWeek.substring(1, cDueWeek.indexOf("周"))); | |
| 728 | + // if (week >= 20) { | |
| 729 | + // //宫高 | |
| 730 | + // antChuJson.put("gongGao", StringUtils.unitHandle(antExChuModel.getGonggao(), UnitConstants.CM)); | |
| 731 | + // } else if (week < 20) { | |
| 732 | + // if (StringUtils.isNotEmpty(antExChuModel.getGonggaoSelect())) { | |
| 733 | + // if (StringUtils.isNotEmpty(antExChuModel.getGonggaoType())) { | |
| 734 | + // //宫高 | |
| 735 | + // antChuJson.put("gongGao", GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoSelect()) + "，" + GongJingEnums.getHengZhiNameById(antExChuModel.getGonggaoType())); | |
| 736 | + // } else { | |
| 737 | + // //宫高 | |
| 738 | + // antChuJson.put("gongGao", GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoSelect())); | |
| 739 | + // } | |
| 740 | + // } | |
| 741 | + // } | |
| 742 | + String gongGao = ""; | |
| 743 | + if(StringUtils.isNotEmpty(antExChuModel.getGonggao())){ | |
| 744 | + gongGao = StringUtils.unitHandle(antExChuModel.getGonggao(), UnitConstants.CM); | |
| 716 | 745 | } |
| 746 | + if(StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoSelect()))){ | |
| 747 | + gongGao +=GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoSelect()); | |
| 748 | + } | |
| 717 | 749 | |
| 750 | + if(StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoType()))){ | |
| 751 | + gongGao +=GongJingEnums.getHengZhiNameById(antExChuModel.getGonggaoType()); | |
| 752 | + } | |
| 753 | + antChuJson.put("gongGao", gongGao); | |
| 718 | 754 | //腹围 |
| 719 | 755 | antChuJson.put("fuwei", StringUtils.unitHandle(antExChuModel.getFuwei(), UnitConstants.CM)); |
| 720 | 756 | //身高 |
| ... | ... | @@ -1070,8 +1106,11 @@ |
| 1070 | 1106 | //诊断其他 |
| 1071 | 1107 | antChuJson.put("diagnosisOther", antExChuModel.getDiagnosisOther()); |
| 1072 | 1108 | //处理意见 |
| 1073 | - // antChuJson.put("treatOpinion", antExChuModel.getTreatOpinion()); | |
| 1074 | - antChuJson.put("treatOpinion", getTreatmentOpinion3(antExChuModel.getTreatmentOpinion2())); | |
| 1109 | + if(StringUtils.isNotEmpty(antExChuModel.getTreatOpinion())){ | |
| 1110 | + antChuJson.put("treatOpinion", antExChuModel.getTreatOpinion()); | |
| 1111 | + }else{ | |
| 1112 | + antChuJson.put("treatOpinion", getTreatmentOpinion3(antExChuModel.getTreatmentOpinion2())); | |
| 1113 | + } | |
| 1075 | 1114 | //指导意见 |
| 1076 | 1115 | antChuJson.put("dirOpinion", antExChuModel.getDirOpinion()); |
| 1077 | 1116 | //B超 |
| 1078 | 1117 | |
| 1079 | 1118 | |
| ... | ... | @@ -1399,22 +1438,36 @@ |
| 1399 | 1438 | //产检孕周 |
| 1400 | 1439 | String cDueWeek = DateUtil.getPregnancyWeek(patients.getLastMenses(), antExFuModel.getCheckDate()); |
| 1401 | 1440 | antFuJson.put("cDueWeek", cDueWeek); |
| 1402 | - int week = Integer.parseInt(cDueWeek.substring(1, cDueWeek.indexOf("周"))); | |
| 1403 | - if (week >= 20) { | |
| 1404 | - //宫高 | |
| 1405 | - antFuJson.put("gongGao", StringUtils.unitHandle(antExFuModel.getGongGao(), UnitConstants.CM)); | |
| 1406 | - } else if (week < 20) { | |
| 1407 | - if (org.apache.commons.lang.StringUtils.isNotEmpty(antExFuModel.getGongGaoSelect())) { | |
| 1408 | - if (org.apache.commons.lang.StringUtils.isNotEmpty(antExFuModel.getGongGaoType())) { | |
| 1409 | - //宫高 | |
| 1410 | - antFuJson.put("gongGao", GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoSelect()) + "，" + GongJingEnums.getHengZhiNameById(antExFuModel.getGongGaoType())); | |
| 1411 | - } else { | |
| 1412 | - //宫高 | |
| 1413 | - antFuJson.put("gongGao", GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoSelect())); | |
| 1414 | - } | |
| 1415 | - } | |
| 1441 | + // int week = Integer.parseInt(cDueWeek.substring(1, cDueWeek.indexOf("周"))); | |
| 1442 | + // if (week >= 20) { | |
| 1443 | + // //宫高 | |
| 1444 | + // antFuJson.put("gongGao", StringUtils.unitHandle(antExFuModel.getGongGao(), UnitConstants.CM)); | |
| 1445 | + // } else if (week < 20) { | |
| 1446 | + // if (org.apache.commons.lang.StringUtils.isNotEmpty(antExFuModel.getGongGaoSelect())) { | |
| 1447 | + // if (org.apache.commons.lang.StringUtils.isNotEmpty(antExFuModel.getGongGaoType())) { | |
| 1448 | + // //宫高 | |
| 1449 | + // antFuJson.put("gongGao", GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoSelect()) + "，" + GongJingEnums.getHengZhiNameById(antExFuModel.getGongGaoType())); | |
| 1450 | + // } else { | |
| 1451 | + // //宫高 | |
| 1452 | + // antFuJson.put("gongGao", GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoSelect())); | |
| 1453 | + // } | |
| 1454 | + // } | |
| 1455 | + // } | |
| 1456 | + | |
| 1457 | + | |
| 1458 | + String gongGao = ""; | |
| 1459 | + if(StringUtils.isNotEmpty(antExFuModel.getGongGao())){ | |
| 1460 | + gongGao = StringUtils.unitHandle(antExFuModel.getGongGao(), UnitConstants.CM); | |
| 1416 | 1461 | } |
| 1462 | + if(StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoSelect()))){ | |
| 1463 | + gongGao +=GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoSelect()); | |
| 1464 | + } | |
| 1417 | 1465 | |
| 1466 | + if(StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoType()))){ | |
| 1467 | + gongGao +=GongJingEnums.getHengZhiNameById(antExFuModel.getGongGaoType()); | |
| 1468 | + } | |
| 1469 | + antFuJson.put("gongGao", gongGao); | |
| 1470 | + | |
| 1418 | 1471 | //腹围 |
| 1419 | 1472 | antFuJson.put("abdomCircum", StringUtils.unitHandle(antExFuModel.getAbdominalCircumference(), UnitConstants.CM)); |
| 1420 | 1473 | |
| ... | ... | @@ -1490,8 +1543,12 @@ |
| 1490 | 1543 | antFuJson.put("dirOpinion", antExFuModel.getGuide()); |
| 1491 | 1544 | //指导意见其他 |
| 1492 | 1545 | antFuJson.put("diagnosisOther", antExFuModel.getDiagnosisOther()); |
| 1493 | - // 处理意见 | |
| 1494 | - antFuJson.put("treatOpinion", getTreatmentOpinion3(antExFuModel.getTreatmentOpinion2())); | |
| 1546 | + //处理意见 | |
| 1547 | + if(StringUtils.isNotEmpty(antExFuModel.getTreatmentOpinion())){ | |
| 1548 | + antFuJson.put("treatOpinion", antExFuModel.getTreatmentOpinion()); | |
| 1549 | + }else{ | |
| 1550 | + antFuJson.put("treatOpinion", getTreatmentOpinion3(antExFuModel.getTreatmentOpinion2())); | |
| 1551 | + } | |
| 1495 | 1552 | antFuJson.put("checkDoctor", checkDoctor); |
| 1496 | 1553 | // antFuJson.put("treatmentOpinion", antExFuModel.getTreatmentOpinion()); |
| 1497 | 1554 | return antFuJson.toString(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
View file @
9195b7e
| ... | ... | @@ -524,8 +524,6 @@ |
| 524 | 524 | public BaseObjectResponse list(TrackDownQueryRequest downQueryRequest, Integer userId) { |
| 525 | 525 | //转换为本地的查询条件 |
| 526 | 526 | TrackDownRecordQuery downRecordQuery = convertNaviteQuery(downQueryRequest, userId); |
| 527 | - | |
| 528 | - | |
| 529 | 527 | List<TrackDownRecord> downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery); |
| 530 | 528 | List<Map> data = new ArrayList<>(); |
| 531 | 529 | TrackDownTypeHandler downTypeHandler = trackDownTypeHandlerMap.get(downQueryRequest.getTrackType()); |