Commit c27267c4a81c374a8bb83f6099008aabd06b70bf
1 parent
0f1c4dad2a
Exists in
master
and in
6 other branches
bug修复
Showing 1 changed file with 4 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
c27267c
| ... | ... | @@ -369,7 +369,6 @@ |
| 369 | 369 | } |
| 370 | 370 | } |
| 371 | 371 | |
| 372 | - | |
| 373 | 372 | //新增分娩信息 |
| 374 | 373 | matDeliverService.addMatDeliver(maternalDeliverModel); |
| 375 | 374 | |
| ... | ... | @@ -1925,7 +1924,7 @@ |
| 1925 | 1924 | } |
| 1926 | 1925 | |
| 1927 | 1926 | |
| 1928 | - List<String> currentParentIdList = matDeliverQuery.getParentIdList(); | |
| 1927 | + /*List<String> currentParentIdList = matDeliverQuery.getParentIdList(); | |
| 1929 | 1928 | |
| 1930 | 1929 | List<String> townOrgIds = new ArrayList<>(); |
| 1931 | 1930 | |
| 1932 | 1931 | |
| ... | ... | @@ -1935,12 +1934,14 @@ |
| 1935 | 1934 | townOrgIds.add(p.getId()); |
| 1936 | 1935 | } |
| 1937 | 1936 | |
| 1937 | + | |
| 1938 | + | |
| 1938 | 1939 | if (CollectionUtils.isEmpty(currentParentIdList)) { |
| 1939 | 1940 | currentParentIdList = townOrgIds; |
| 1940 | 1941 | } else { |
| 1941 | 1942 | currentParentIdList.retainAll(townOrgIds); |
| 1942 | 1943 | } |
| 1943 | - matDeliverQuery.setParentIdList(currentParentIdList); | |
| 1944 | + matDeliverQuery.setParentIdList(currentParentIdList);*/ | |
| 1944 | 1945 | if (StringUtils.isNotEmpty(matdeliverFollowRequest.getNeed())) {//是否分页 |
| 1945 | 1946 | matDeliverQuery.setNeed("need"); |
| 1946 | 1947 | matDeliverQuery.setLimit(matdeliverFollowRequest.getLimit()); |