Commit 7d1cd0dabb2e760baeb3653466179936807ec532
1 parent
7d1dd02a94
Exists in
master
and in
6 other branches
新筛接口
Showing 1 changed file with 17 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
View file @
7d1cd0d
| ... | ... | @@ -970,7 +970,23 @@ |
| 970 | 970 | query.setTestNumber(testNum); |
| 971 | 971 | List<NewSieveLabModel> list = babySieveService.queryNewSieveLab(query); |
| 972 | 972 | if(list != null && list.size() > 0){ |
| 973 | - br.setData(list); | |
| 973 | + NewSieveLabModel newSieveLabModel = new NewSieveLabModel(); | |
| 974 | + newSieveLabModel.setTestNumber(list.get(0).getTestNumber()); | |
| 975 | + newSieveLabModel.setNtshsyingguang(list.get(0).getNtshsyingguang()); | |
| 976 | + newSieveLabModel.setNtshsnongdu(list.get(0).getNtshsnongdu()); | |
| 977 | + newSieveLabModel.setPkuhyingguang(list.get(0).getPkuhyingguang()); | |
| 978 | + newSieveLabModel.setPkuhnongdu(list.get(0).getPkuhnongdu()); | |
| 979 | + if(list != null && list.size() > 1){ | |
| 980 | + if(StringUtils.isEmpty(newSieveLabModel.getNtshsyingguang()) && StringUtils.isEmpty(newSieveLabModel.getNtshsnongdu())){ | |
| 981 | + newSieveLabModel.setNtshsyingguang(list.get(1).getNtshsyingguang()); | |
| 982 | + newSieveLabModel.setNtshsnongdu(list.get(1).getNtshsnongdu()); | |
| 983 | + }else{ | |
| 984 | + newSieveLabModel.setPkuhyingguang(list.get(1).getPkuhyingguang()); | |
| 985 | + newSieveLabModel.setPkuhnongdu(list.get(1).getPkuhnongdu()); | |
| 986 | + } | |
| 987 | + } | |
| 988 | + | |
| 989 | + br.setData(newSieveLabModel); | |
| 974 | 990 | br.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); |
| 975 | 991 | return br; |
| 976 | 992 | } |