Commit b11ea18f348c1e3dee6a1eb6e5fd537a03a02208
1 parent
0be8c3fd9a
Exists in
master
and in
6 other branches
修改bug、
Showing 1 changed file with 25 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
b11ea18
| ... | ... | @@ -2054,8 +2054,6 @@ |
| 2054 | 2054 | map.put("secondaryDiagnosisId", secondaryDiagnosisId); |
| 2055 | 2055 | |
| 2056 | 2056 | |
| 2057 | - | |
| 2058 | - | |
| 2059 | 2057 | map.put("treatOpinion", data.getTreatOpinion()); |
| 2060 | 2058 | map.put("dirOpinion", data.getDirOpinion()); |
| 2061 | 2059 | map.put("quicken", QuickenEnums.getName(data.getQuicken())); |
| ... | ... | @@ -2182,6 +2180,8 @@ |
| 2182 | 2180 | //孕妇基本信息 |
| 2183 | 2181 | map.put("id", data.getId()); |
| 2184 | 2182 | map.put("diagnosisOther", data.getDiagnosisOther()); |
| 2183 | + map.put("secondaryDiagnosis", data.getSecondaryDiagnosis()); | |
| 2184 | + | |
| 2185 | 2185 | map.put("bloodSugar", UnitUtils.unitSplice(data.getBloodSugar(), UnitConstants.MMOLL)); |
| 2186 | 2186 | map.put("bloodSugar2", UnitUtils.unitSplice(data.getBloodSugar2(), UnitConstants.MMOLL)); |
| 2187 | 2187 | map.put("bloodSugar3", UnitUtils.unitSplice(data.getBloodSugar3(), UnitConstants.MMOLL)); |
| ... | ... | @@ -2396,6 +2396,28 @@ |
| 2396 | 2396 | } |
| 2397 | 2397 | } |
| 2398 | 2398 | map.put("diagnosis", diagnosis); |
| 2399 | + | |
| 2400 | + /* 次要诊断次要 */ | |
| 2401 | + String secondaryDiagnosisId = ""; | |
| 2402 | + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getSecondaryDiagnosisId())) { | |
| 2403 | + List<String> temp = JsonUtil.toList(data.getSecondaryDiagnosisId(), String.class); | |
| 2404 | + if (CollectionUtils.isNotEmpty(temp)) { | |
| 2405 | + | |
| 2406 | + StringBuilder sb = new StringBuilder(); | |
| 2407 | + | |
| 2408 | + for (String sId : temp) { | |
| 2409 | + sb.append(FunvCommonUtil.getBaseicConfigByid(sId, basicConfigService)).append(","); | |
| 2410 | + } | |
| 2411 | + if (sb.toString().endsWith(",")) { | |
| 2412 | + secondaryDiagnosisId = sb.substring(0, sb.length() - 1); | |
| 2413 | + } else { | |
| 2414 | + secondaryDiagnosisId = sb.toString(); | |
| 2415 | + } | |
| 2416 | + } | |
| 2417 | + } | |
| 2418 | + map.put("secondaryDiagnosisId", secondaryDiagnosisId); | |
| 2419 | + | |
| 2420 | + | |
| 2399 | 2421 | map.put("treatmentOpinion", data.getTreatmentOpinion()); |
| 2400 | 2422 | map.put("guide", data.getGuide()); |
| 2401 | 2423 | map.put("mHighRiskReason", mongoUtil.findPlatValueList(data.getmHighRiskReason())); |
| ... | ... | @@ -6002,7 +6024,7 @@ |
| 6002 | 6024 | map.put("developmentQuotient", developmentQuotient); |
| 6003 | 6025 | BaseResponse response = new BaseResponse(); |
| 6004 | 6026 | response.setObject(map); |
| 6005 | - return response; | |
| 6027 | + return response; | |
| 6006 | 6028 | } |
| 6007 | 6029 | } |