Commit bf7babce3e27bbe376e92ff6340a94c0d7cc0202
1 parent
2547ed1c68
Exists in
master
and in
6 other branches
卫计委修改分娩记录
Showing 1 changed file with 13 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
bf7babc
| ... | ... | @@ -2,7 +2,6 @@ |
| 2 | 2 | |
| 3 | 3 | import com.lyms.hospitalapi.lcdcf.LcdcfHisModel; |
| 4 | 4 | import com.lyms.hospitalapi.lcdcf.LcdcfHisService; |
| 5 | -import com.lyms.platform.biz.RemoteService; | |
| 6 | 5 | import com.lyms.platform.biz.service.*; |
| 7 | 6 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 8 | 7 | import com.lyms.platform.common.enums.*; |
| 9 | 8 | |
| ... | ... | @@ -167,14 +166,17 @@ |
| 167 | 166 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 168 | 167 | MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel(); |
| 169 | 168 | |
| 170 | - //表示区域的 | |
| 171 | - if (StringUtils.isNotEmpty(organizationGroupsFacade.findByCurrentUserId(hospitalId))) { | |
| 172 | - String parentId = antenatalExaminationFacade.handHideBuild(deliverAddRequest.getPid(), deliverAddRequest.getParentId(), userId, -1); | |
| 173 | - if (StringUtils.isEmpty(parentId)) { | |
| 174 | - logger.warn("get handHideBuild parentId is null."); | |
| 169 | + //非卫计委出修改做区域隐藏建档 | |
| 170 | + if (deliverAddRequest.getPatient() == null) { | |
| 171 | + //表示区域的 | |
| 172 | + if (StringUtils.isNotEmpty(organizationGroupsFacade.findByCurrentUserId(hospitalId))) { | |
| 173 | + String parentId = antenatalExaminationFacade.handHideBuild(deliverAddRequest.getPid(), deliverAddRequest.getParentId(), userId, -1); | |
| 174 | + if (StringUtils.isEmpty(parentId)) { | |
| 175 | + logger.warn("get handHideBuild parentId is null."); | |
| 176 | + } | |
| 177 | + maternalDeliverModel.setParentId(parentId); | |
| 178 | + deliverAddRequest.setParentId(parentId); | |
| 175 | 179 | } |
| 176 | - maternalDeliverModel.setParentId(parentId); | |
| 177 | - deliverAddRequest.setParentId(parentId); | |
| 178 | 180 | } |
| 179 | 181 | |
| 180 | 182 | //增加 |
| ... | ... | @@ -275,8 +277,9 @@ |
| 275 | 277 | maternalDeliverModel.setBaby(updateBaby(deliverAddRequest, list, patients1.getLastMenses())); |
| 276 | 278 | } |
| 277 | 279 | } |
| 278 | - | |
| 279 | - maternalDeliverModel.setHospitalId(hospitalId); | |
| 280 | + if (deliverAddRequest.getPatient() == null) { | |
| 281 | + maternalDeliverModel.setHospitalId(hospitalId); | |
| 282 | + } | |
| 280 | 283 | //做分娩的时候需要删除产筛数据 |
| 281 | 284 | |
| 282 | 285 | sieveService.deleteSieve(deliverAddRequest.getParentId(), hospitalId, null); |