Commit 0d713378b43cd1ce87db084b1c7d85056c85416b
1 parent
ef00296e84
Exists in
master
and in
6 other branches
儿童列表修改
Showing 2 changed files with 25 additions and 19 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
0d71337
| ... | ... | @@ -2818,23 +2818,23 @@ |
| 2818 | 2818 | } |
| 2819 | 2819 | |
| 2820 | 2820 | //查询是否有检查记录 |
| 2821 | - for (BabyManageListResult result : list) { | |
| 2822 | - BabyCheckModelQuery query = new BabyCheckModelQuery(); | |
| 2823 | - query.setYn(YnEnums.YES.getId()); | |
| 2824 | - query.setBuildId(result.getId()); | |
| 2825 | - List <BabyCheckModel> checkModels = babyCheckService.queryBabyCheckRecord(query); | |
| 2826 | - if(checkModels.size()>0){ | |
| 2827 | - result.setHasChkRecord(true); | |
| 2828 | - }else{ | |
| 2829 | - result.setHasChkRecord(false); | |
| 2830 | - } | |
| 2831 | - result.setChkCnt(checkModels.size()); | |
| 2832 | -// for (int i = 0; i < checkModels.size(); i++) { | |
| 2833 | -// if(checkModels.get(i).getId().equals(result.getId())){ | |
| 2834 | -// result.setChkCnt(i+1); | |
| 2835 | -// } | |
| 2821 | +// for (BabyManageListResult result : list) { | |
| 2822 | +// BabyCheckModelQuery query = new BabyCheckModelQuery(); | |
| 2823 | +// query.setYn(YnEnums.YES.getId()); | |
| 2824 | +// query.setBuildId(result.getId()); | |
| 2825 | +// List <BabyCheckModel> checkModels = babyCheckService.queryBabyCheckRecord(query); | |
| 2826 | +// if(checkModels.size()>0){ | |
| 2827 | +// result.setHasChkRecord(true); | |
| 2828 | +// }else{ | |
| 2829 | +// result.setHasChkRecord(false); | |
| 2836 | 2830 | // } |
| 2837 | - } | |
| 2831 | +// result.setChkCnt(checkModels.size()); | |
| 2832 | +//// for (int i = 0; i < checkModels.size(); i++) { | |
| 2833 | +//// if(checkModels.get(i).getId().equals(result.getId())){ | |
| 2834 | +//// result.setChkCnt(i+1); | |
| 2835 | +//// } | |
| 2836 | +//// } | |
| 2837 | +// } | |
| 2838 | 2838 | |
| 2839 | 2839 | BaseListResponse objectResponse = new BaseListResponse(); |
| 2840 | 2840 | objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java
View file @
0d71337
| ... | ... | @@ -103,11 +103,11 @@ |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | |
| 106 | - String weakSonsInfo = basicConfigFacade.queryBaseInfoByStr(model.getWeakSonInfo()); | |
| 107 | - result.setWeakSonInfo(weakSonsInfo); | |
| 106 | +// String weakSonsInfo = basicConfigFacade.queryBaseInfoByStr(model.getWeakSonInfo()); | |
| 107 | +// result.setWeakSonInfo(weakSonsInfo); | |
| 108 | 108 | String highRiskInfos = basicConfigFacade.queryBaseInfoByStr(model.getHighRiskInfo()); |
| 109 | 109 | result.setHighRiskInfo(highRiskInfos); |
| 110 | - result.setWeakSon(model.getWeakSon() == null ? "否" : model.getWeakSon() == 1 ? "是" : "否"); | |
| 110 | + // result.setWeakSon(model.getWeakSon() == null ? "否" : model.getWeakSon() == 1 ? "是" : "否"); | |
| 111 | 111 | result.setDueWeek(model.getDueWeek()); |
| 112 | 112 | //秦皇岛20121222纠正月龄 |
| 113 | 113 | if(model.getDueWeek()!=null&&model.getDueWeek()<37&&model.getHospitalId().equals("216")){ |
| ... | ... | @@ -173,6 +173,12 @@ |
| 173 | 173 | { |
| 174 | 174 | BabyCheckModel checkModel = models.get(0); |
| 175 | 175 | result.setLastNextDate(DateUtil.getyyyy_MM_dd(checkModel.getNextDate())); |
| 176 | + if(models.size()>0){ | |
| 177 | + result.setHasChkRecord(true); | |
| 178 | + }else{ | |
| 179 | + result.setHasChkRecord(false); | |
| 180 | + } | |
| 181 | + result.setChkCnt(models.size()); | |
| 176 | 182 | } |
| 177 | 183 | if (String.valueOf("true").equals(isArea)) { |
| 178 | 184 |