Commit ab82808e7f83ff9437a29ceb373d0300c14d1caa
1 parent
327a840fe2
Exists in
master
and in
6 other branches
儿童检查
Showing 1 changed file with 12 additions and 14 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
ab82808
| ... | ... | @@ -1896,17 +1896,16 @@ |
| 1896 | 1896 | } |
| 1897 | 1897 | |
| 1898 | 1898 | //表示区域的 |
| 1899 | -// if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { | |
| 1900 | -// List list = new ArrayList(); | |
| 1901 | -// list.add("1"); | |
| 1902 | -// list.add("2"); | |
| 1903 | -// babyQuery.setEnableListNot(list); | |
| 1904 | -// } | |
| 1905 | -// | |
| 1906 | -// List <String> hList = groupsFacade.findGroupHospital(userId, false); | |
| 1907 | -// babyQuery.setHospitalIdList(hList); | |
| 1908 | - babyQuery.setHospitalId(hospitalId); | |
| 1899 | + if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { | |
| 1900 | + List list = new ArrayList(); | |
| 1901 | + list.add("1"); | |
| 1902 | + list.add("2"); | |
| 1903 | + babyQuery.setEnableListNot(list); | |
| 1904 | + } | |
| 1909 | 1905 | |
| 1906 | + List <String> hList = groupsFacade.findGroupHospital(userId, false); | |
| 1907 | + babyQuery.setHospitalIdList(hList); | |
| 1908 | + | |
| 1910 | 1909 | Map <String, List <BabyChooseResult>> listMap = new HashMap <>(); |
| 1911 | 1910 | |
| 1912 | 1911 | List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); |
| ... | ... | @@ -1931,10 +1930,9 @@ |
| 1931 | 1930 | |
| 1932 | 1931 | |
| 1933 | 1932 | for (BabyModel model : models) { |
| 1934 | -// if (model != null && model.getHospitalId() != null && hList.contains(hospitalId)) { | |
| 1935 | -// isBuild = true; | |
| 1936 | -// } | |
| 1937 | - isBuild = true; | |
| 1933 | + if (model != null && model.getHospitalId() != null && hList.contains(hospitalId)) { | |
| 1934 | + isBuild = true; | |
| 1935 | + } | |
| 1938 | 1936 | BabyChooseResult result = new BabyChooseResult(); |
| 1939 | 1937 | result.setId(model.getId()); |
| 1940 | 1938 | result.setPid(model.getPid()); |