jiangjiazhi / regional-platform

Download as
Browse Code »

Commit adb35c74a2d317b8f260c412c97d3afab981591a

Authored by liquanyu
1 parent 96ca94cae8
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 2 changed files with 49 additions and 16 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ adb35c7
... ... @@ -1645,7 +1645,8 @@
1645 1645 * @param doctorId
1646 1646 * @return
1647 1647 */
1648   - public BaseResponse inputWxData(String fuh, String abdominalGirth, String fhr,String edema, String pid, String hospitalId, String nextTime, String doctorId) {
  1648 + public BaseResponse inputWxData(String fuh, String abdominalGirth, String fhr,String edema, String pid,
  1649 + String hospitalId, String nextTime, String doctorId) {
1649 1650 WxMeasureInfoModel wxMeasureInfo = new WxMeasureInfoModel();
1650 1651 boolean falg = true;
1651 1652 if (StringUtils.isNotEmpty(pid) && StringUtils.isNotEmpty(hospitalId)) {
... ... @@ -1812,6 +1813,7 @@
1812 1813 yumInfosMap.put("fuh", fuh);
1813 1814 yumInfosMap.put("abdominalGirth", abdominalGirth);
1814 1815 yumInfosMap.put("fhr", fhr);
  1816 + yumInfosMap.put("edema", edema);
1815 1817 yumInfosMap.put("nextTime", nextTime);
1816 1818 WxMeasureInfoModel wxMeasure = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("type").is("1")), WxMeasureInfoModel.class);
1817 1819 if (null == wxMeasure) {
... ... @@ -1841,6 +1843,9 @@
1841 1843 }
1842 1844 if (null == yumInfosMap.get("fhr") || "" == yumInfosMap.get("fhr")) {
1843 1845 yumInfosMap.put("fhr", map.get("fhr"));
  1846 + }
  1847 + if (null == yumInfosMap.get("edema") || "" == yumInfosMap.get("edema")) {
  1848 + yumInfosMap.put("edema", map.get("edema"));
1844 1849 }
1845 1850 if (null == yumInfosMap.get("nextTime") || "" == yumInfosMap.get("nextTime")) {
1846 1851 yumInfosMap.put("nextTime", map.get("nextTime"));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ adb35c7
... ... @@ -2738,10 +2738,17 @@
2738 2738 map.put("gonggao", UnitUtils.unitSplice(data.getGonggao(), UnitConstants.CM)); // 宫高
2739 2739 map.put("fuwei", UnitUtils.unitSplice(data.getFuwei(), UnitConstants.CM));//腹围
2740 2740 String edema = "";
2741   - if (StringUtils.isNotEmpty(data.getEdema())) {
2742   - for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) {
2743   - if (data.getEdema().equals(fuZhongEnums.getId())) {
2744   - edema = fuZhongEnums.getName();
  2741 + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getEdema())) {
  2742 + if (Integer.parseInt(data.getEdema()) > 3)
  2743 + {
  2744 + edema = "4".equals(data.getEdema()) ? "有" : "无";
  2745 + }
  2746 + else
  2747 + {
  2748 + for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) {
  2749 + if (data.getEdema().equals(fuZhongEnums.getId())) {
  2750 + edema = fuZhongEnums.getName();
  2751 + }
2745 2752 }
2746 2753 }
2747 2754 }
... ... @@ -3157,9 +3164,16 @@
3157 3164 map.put("abdominalCircumference", UnitUtils.unitSplice(data.getAbdominalCircumference(), UnitConstants.CM));
3158 3165 String edema = "";
3159 3166 if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getEdema())) {
3160   - for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) {
3161   - if (data.getEdema().equals(fuZhongEnums.getId())) {
3162   - edema = fuZhongEnums.getName();
  3167 + if (Integer.parseInt(data.getEdema()) > 3)
  3168 + {
  3169 + edema = "4".equals(data.getEdema()) ? "有" : "无";
  3170 + }
  3171 + else
  3172 + {
  3173 + for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) {
  3174 + if (data.getEdema().equals(fuZhongEnums.getId())) {
  3175 + edema = fuZhongEnums.getName();
  3176 + }
3163 3177 }
3164 3178 }
3165 3179 }
... ... @@ -3458,10 +3472,17 @@
3458 3472 map.put("gongGao", gongGao);//宫高
3459 3473 map.put("abdominalCircumference", UnitUtils.unitSplice(data.getAbdominalCircumference(), UnitConstants.CM));//腹围
3460 3474 String edema = "";
3461   - if (StringUtils.isNotEmpty(data.getEdema())) {
3462   - for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) {
3463   - if (data.getEdema().equals(fuZhongEnums.getId())) {
3464   - edema = fuZhongEnums.getName();
  3475 + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getEdema())) {
  3476 + if (Integer.parseInt(data.getEdema()) > 3)
  3477 + {
  3478 + edema = "4".equals(data.getEdema()) ? "有" : "无";
  3479 + }
  3480 + else
  3481 + {
  3482 + for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) {
  3483 + if (data.getEdema().equals(fuZhongEnums.getId())) {
  3484 + edema = fuZhongEnums.getName();
  3485 + }
3465 3486 }
3466 3487 }
3467 3488 }
... ... @@ -8384,10 +8405,17 @@
8384 8405 map.put("urineProtein", data.getUrineProtein()); //尿蛋白
8385 8406 map.put("hemoglobin", data.getHemoglobin()); //血红蛋白
8386 8407 String edema = "";
8387   - if (StringUtils.isNotEmpty(data.getEdema())) {
8388   - for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) {
8389   - if (data.getEdema().equals(fuZhongEnums.getId())) {
8390   - edema = fuZhongEnums.getName();
  8408 + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getEdema())) {
  8409 + if (Integer.parseInt(data.getEdema()) > 3)
  8410 + {
  8411 + edema = "4".equals(data.getEdema()) ? "有" : "无";
  8412 + }
  8413 + else
  8414 + {
  8415 + for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) {
  8416 + if (data.getEdema().equals(fuZhongEnums.getId())) {
  8417 + edema = fuZhongEnums.getName();
  8418 + }
8391 8419 }
8392 8420 }
8393 8421 }