Commit 050e84c49c41d206687e504824bafa1c9bc99f12
1 parent
02a2ccfca2
Exists in
master
and in
6 other branches
update code
Showing 1 changed file with 38 additions and 15 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
050e84c
| ... | ... | @@ -680,17 +680,20 @@ |
| 680 | 680 | if (CollectionUtils.isNotEmpty(data.getTireData())){ |
| 681 | 681 | for (Object temp : data.getTireData()){ |
| 682 | 682 | Map<String,String> tire = JsonUtil.getMap(temp.toString()); |
| 683 | - String heartRate = tire.get("heartRate"); | |
| 684 | - String fetalPosition = tire.get("fetalPosition"); | |
| 685 | - String fetalPresentation = tire.get("fetalPresentation"); | |
| 686 | - String join = tire.get("join"); | |
| 683 | + if (tire != null) | |
| 684 | + { | |
| 685 | + String heartRate = tire.get("heartRate"); | |
| 686 | + String fetalPosition = tire.get("fetalPosition"); | |
| 687 | + String fetalPresentation = tire.get("fetalPresentation"); | |
| 688 | + String join = tire.get("join"); | |
| 687 | 689 | |
| 688 | - Map<String,Object> tireMap = new HashMap<>(); | |
| 689 | - tireMap.put("heartRate",UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN)); | |
| 690 | - tireMap.put("fetalPosition", FetalPositionEnums.getTitle(fetalPosition)); | |
| 691 | - tireMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation)); | |
| 692 | - tireMap.put("join", JoinEnums.getTitle(join)); | |
| 693 | - tireList.add(tireMap); | |
| 690 | + Map<String,Object> tireMap = new HashMap<>(); | |
| 691 | + tireMap.put("heartRate",UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN)); | |
| 692 | + tireMap.put("fetalPosition", FetalPositionEnums.getTitle(fetalPosition)); | |
| 693 | + tireMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation)); | |
| 694 | + tireMap.put("join", JoinEnums.getTitle(join)); | |
| 695 | + tireList.add(tireMap); | |
| 696 | + } | |
| 694 | 697 | } |
| 695 | 698 | } |
| 696 | 699 | map.put("tireData",tireList); |
| 697 | 700 | |
| ... | ... | @@ -947,9 +950,18 @@ |
| 947 | 950 | if (MapUtils.isNotEmpty(chBpMap)) { |
| 948 | 951 | ssy = chBpMap.get("ssy"); |
| 949 | 952 | szy = chBpMap.get("szy"); |
| 953 | + if (StringUtils.isNotEmpty(ssy)) | |
| 954 | + { | |
| 955 | + map.put("ssy", UnitUtils.unitSplice(ssy,UnitConstants.MMHG)); | |
| 956 | + } | |
| 957 | + | |
| 958 | + if (StringUtils.isNotEmpty(szy)) | |
| 959 | + { | |
| 960 | + map.put("szy", UnitUtils.unitSplice(szy,UnitConstants.MMHG)); | |
| 961 | + } | |
| 950 | 962 | } |
| 951 | - map.put("ssy", UnitUtils.unitSplice(ssy,UnitConstants.MMHG)); | |
| 952 | - map.put("szy", UnitUtils.unitSplice(szy,UnitConstants.MMHG)); | |
| 963 | +// map.put("ssy", UnitUtils.unitSplice(ssy,UnitConstants.MMHG)); | |
| 964 | +// map.put("szy", UnitUtils.unitSplice(szy,UnitConstants.MMHG)); | |
| 953 | 965 | // 产后2小时血压 收缩压，舒张压 |
| 954 | 966 | String ssy2h = ""; |
| 955 | 967 | String szy2h = ""; |
| 956 | 968 | |
| ... | ... | @@ -957,9 +969,20 @@ |
| 957 | 969 | if (MapUtils.isNotEmpty(ch2BpMap)) { |
| 958 | 970 | ssy2h = ch2BpMap.get("ssy"); |
| 959 | 971 | szy2h = ch2BpMap.get("szy"); |
| 972 | + | |
| 973 | + if (StringUtils.isNotEmpty(ssy2h)) | |
| 974 | + { | |
| 975 | + map.put("ssy2h",UnitUtils.unitSplice(ssy2h,UnitConstants.MMHG)); | |
| 976 | + } | |
| 977 | + | |
| 978 | + if (StringUtils.isNotEmpty(szy2h)) | |
| 979 | + { | |
| 980 | + map.put("szy2h", UnitUtils.unitSplice(szy2h,UnitConstants.MMHG)); | |
| 981 | + } | |
| 982 | + | |
| 960 | 983 | } |
| 961 | - map.put("ssy2h",UnitUtils.unitSplice(ssy2h,UnitConstants.MMHG)); | |
| 962 | - map.put("szy2h", UnitUtils.unitSplice(szy2h,UnitConstants.MMHG)); | |
| 984 | +// map.put("ssy2h",UnitUtils.unitSplice(ssy2h,UnitConstants.MMHG)); | |
| 985 | +// map.put("szy2h", UnitUtils.unitSplice(szy2h,UnitConstants.MMHG)); | |
| 963 | 986 | |
| 964 | 987 | map.put("breath", UnitUtils.unitSplice(data.getBreath(),UnitConstants.CIFEN)); |
| 965 | 988 | map.put("pulse", UnitUtils.unitSplice(data.getPulse(), UnitConstants.CIFEN)); |