Commit a9d9d7ed93ec688ee0c1f267effdd36083dc32ab
1 parent
902308dd3f
Exists in
master
and in
6 other branches
大同三打印
Showing 1 changed file with 6 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
a9d9d7e
| ... | ... | @@ -7951,7 +7951,8 @@ |
| 7951 | 7951 | |
| 7952 | 7952 | |
| 7953 | 7953 | //产检基本信息 |
| 7954 | - map.put("checkDate", DateUtil.getyyyy_MM_dd(data.getCheckDate())); | |
| 7954 | + map.put("userName", patients.getUsername()); | |
| 7955 | + map.put("lastMenses", DateUtil.getyyyy_MM_dd(data.getLastMenses())); | |
| 7955 | 7956 | map.put("checkWeek", DateUtil.getWeekDesc(patients.getLastMenses(),data.getCheckDate())); |
| 7956 | 7957 | // 血压 |
| 7957 | 7958 | String ssy = ""; |
| ... | ... | @@ -7961,7 +7962,7 @@ |
| 7961 | 7962 | ssy = chBpMap.get("ssy"); |
| 7962 | 7963 | szy = chBpMap.get("szy"); |
| 7963 | 7964 | } |
| 7964 | - map.put("bp", UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG)); | |
| 7965 | + map.put("bp", ssy + "/" + szy); | |
| 7965 | 7966 | map.put("weight", data.getWeight()); |
| 7966 | 7967 | map.put("urineProtein", data.getUrineProtein()); //尿蛋白 |
| 7967 | 7968 | map.put("hemoglobin", data.getHemoglobin()); //血红蛋白 |
| ... | ... | @@ -7982,7 +7983,7 @@ |
| 7982 | 7983 | gongGao = GongJingEnums.getGongGaoNameById(data.getGongGaoSelect()); |
| 7983 | 7984 | } |
| 7984 | 7985 | } else if (StringUtils.isNotEmpty(data.getGongGao())) { |
| 7985 | - gongGao = UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM); | |
| 7986 | + gongGao = data.getGongGao() ==null ? "" : data.getGongGao(); | |
| 7986 | 7987 | } |
| 7987 | 7988 | |
| 7988 | 7989 | map.put("gf", gongGao+(data.getAbdominalCircumference() == null ? "" : "/"+data.getAbdominalCircumference())); |
| ... | ... | @@ -7995,8 +7996,8 @@ |
| 7995 | 7996 | Map<String, Object> tire = (Map<String, Object>) temp; |
| 7996 | 7997 | if (tire != null) { |
| 7997 | 7998 | heartRate = tire.get("heartRate") == null ? "" : String.valueOf(tire.get("heartRate")); |
| 7998 | - fetalPosition = tire.get("fetalPosition") == null ? "" : String.valueOf(tire.get("fetalPosition")); | |
| 7999 | - fetalPresentation = tire.get("fetalPresentation") == null ? "" : String.valueOf(tire.get("fetalPresentation")); | |
| 7999 | + fetalPosition = tire.get("fetalPosition") == null ? "" : FetalPositionEnums.getTitle(String.valueOf(tire.get("fetalPosition"))); | |
| 8000 | + fetalPresentation = tire.get("fetalPresentation") == null ? "" : FetalEnums.getTitle(String.valueOf(tire.get("fetalPresentation"))); | |
| 8000 | 8001 | } |
| 8001 | 8002 | } |
| 8002 | 8003 | } |