Commit eaffbd87da57fed73d9388571e2049a451a2e7cf
1 parent
3043f59e1e
Exists in
master
and in
6 other branches
威海产后观察
Showing 1 changed file with 4 additions and 8 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
eaffbd8
| ... | ... | @@ -2134,11 +2134,11 @@ |
| 2134 | 2134 | |
| 2135 | 2135 | /**********增加产后观察，观察状态条件查询**********/ |
| 2136 | 2136 | if(StringUtils.isNotEmpty(childbirthManagerRequest.getGcStatus())){ |
| 2137 | + PostpartumRecordsQuery prQuery = new PostpartumRecordsQuery(); | |
| 2138 | + prQuery.setGcStatus("1"); | |
| 2139 | + prQuery.setIsDelete("1"); | |
| 2140 | + List<PostpartumRecords> prList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery); | |
| 2137 | 2141 | if("0".equals(childbirthManagerRequest.getGcStatus())){//正在观察的产妇，填写完分娩记录默认为正在观察 |
| 2138 | - PostpartumRecordsQuery prQuery = new PostpartumRecordsQuery(); | |
| 2139 | - prQuery.setGcStatus("1"); | |
| 2140 | - prQuery.setIsDelete("1"); | |
| 2141 | - List<PostpartumRecords> prList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery); | |
| 2142 | 2142 | if(CollectionUtils.isNotEmpty(prList)){ |
| 2143 | 2143 | List<String> sList = new ArrayList<String>(); |
| 2144 | 2144 | for(PostpartumRecords p : prList){ |
| ... | ... | @@ -2147,10 +2147,6 @@ |
| 2147 | 2147 | matDeliverQuery.setCunZai(sList); |
| 2148 | 2148 | } |
| 2149 | 2149 | }else{ |
| 2150 | - PostpartumRecordsQuery prQuery = new PostpartumRecordsQuery(); | |
| 2151 | - prQuery.setGcStatus("1"); | |
| 2152 | - prQuery.setIsDelete("1"); | |
| 2153 | - List<PostpartumRecords> prList = postpartumRecordsService.getPostpartumRecordsQuery(prQuery); | |
| 2154 | 2150 | if(CollectionUtils.isNotEmpty(prList)){ |
| 2155 | 2151 | List<String> sList = new ArrayList<String>(); |
| 2156 | 2152 | for(PostpartumRecords p : prList){ |