Commit 43e19d1c1b8b1d52d6e2e94f99df02a41cb74bc9
1 parent
066fce3814
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 8 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
43e19d1
| ... | ... | @@ -2984,7 +2984,7 @@ |
| 2984 | 2984 | BaseObjectResponse objectResponse = new BaseObjectResponse(); |
| 2985 | 2985 | if ("4".equals(HIS_VERSION)) { |
| 2986 | 2986 | Map<String, Object> results = qhdfyHisService.queryHisBabyDiagnosis(blNo); |
| 2987 | - results.put("diagnosisItem", "用于测试，暂时固定，测试完成后通知修改恢复！"); | |
| 2987 | + //results.put("diagnosisItem", "用于测试，暂时固定，测试完成后通知修改恢复！"); | |
| 2988 | 2988 | objectResponse.setData(results); |
| 2989 | 2989 | objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); |
| 2990 | 2990 | objectResponse.setErrormsg("成功"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
43e19d1
| ... | ... | @@ -4969,12 +4969,15 @@ |
| 4969 | 4969 | String highRiskInfos = basicConfigFacade.queryBaseInfoByStr(model.getHighRiskInfo()); |
| 4970 | 4970 | result.setHighRiskInfo(highRiskInfos); |
| 4971 | 4971 | if(StringUtils.isEmpty(highRiskInfos)){//秦皇岛高危手动输入需要处理 |
| 4972 | - List getHighRiskInfo = model.getHighRiskInfo(); | |
| 4973 | - for (Object s : getHighRiskInfo) { | |
| 4974 | - if( s!=null && StringUtils.isNotEmpty(s.toString())){ | |
| 4975 | - result.setHighRiskInfo(s.toString()); | |
| 4972 | + if(CollectionUtils.isNotEmpty(model.getHighRiskInfo())){ | |
| 4973 | + List getHighRiskInfo = model.getHighRiskInfo(); | |
| 4974 | + for (Object s : getHighRiskInfo) { | |
| 4975 | + if( s!=null && StringUtils.isNotEmpty(s.toString())){ | |
| 4976 | + result.setHighRiskInfo(s.toString()); | |
| 4977 | + } | |
| 4976 | 4978 | } |
| 4977 | 4979 | } |
| 4980 | + | |
| 4978 | 4981 | } |
| 4979 | 4982 | result.setWeakSon(model.getWeakSon() == null ? "否" : model.getWeakSon() == 1 ? "是" : "否"); |
| 4980 | 4983 |