Commit 327a840fe25a00eda4eea145bdfa7ab3fc66b375
1 parent
e4f394c4a2
Exists in
master
and in
6 other branches
儿童检查
Showing 1 changed file with 14 additions and 12 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
327a840
| ... | ... | @@ -1896,16 +1896,17 @@ |
| 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 | - } | |
| 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); | |
| 1905 | 1909 | |
| 1906 | - List <String> hList = groupsFacade.findGroupHospital(userId, false); | |
| 1907 | - babyQuery.setHospitalIdList(hList); | |
| 1908 | - | |
| 1909 | 1910 | Map <String, List <BabyChooseResult>> listMap = new HashMap <>(); |
| 1910 | 1911 | |
| 1911 | 1912 | List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); |
| ... | ... | @@ -1930,9 +1931,10 @@ |
| 1930 | 1931 | |
| 1931 | 1932 | |
| 1932 | 1933 | for (BabyModel model : models) { |
| 1933 | - if (model != null && model.getHospitalId() != null && hList.contains(hospitalId)) { | |
| 1934 | - isBuild = true; | |
| 1935 | - } | |
| 1934 | +// if (model != null && model.getHospitalId() != null && hList.contains(hospitalId)) { | |
| 1935 | +// isBuild = true; | |
| 1936 | +// } | |
| 1937 | + isBuild = true; | |
| 1936 | 1938 | BabyChooseResult result = new BabyChooseResult(); |
| 1937 | 1939 | result.setId(model.getId()); |
| 1938 | 1940 | result.setPid(model.getPid()); |