Commit 37fcbf87062874b5dd8098ce48fcf0bdb33fe37c
1 parent
2d2212a18e
Exists in
master
and in
8 other branches
修改新电子病历
Showing 1 changed file with 6 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
37fcbf8
| ... | ... | @@ -102,6 +102,7 @@ |
| 102 | 102 | */ |
| 103 | 103 | public BaseResponse addOrUpdateMatDeliver(MatDeliverAddRequest deliverAddRequest, Integer userId) { |
| 104 | 104 | List<MaternalDeliverModel.Baby> babyList = new ArrayList<>(); |
| 105 | + String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 105 | 106 | //增加 |
| 106 | 107 | if (StringUtils.isEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) { |
| 107 | 108 | MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); |
| ... | ... | @@ -150,7 +151,7 @@ |
| 150 | 151 | babyModelQuery.setBirthEnd(patients1.getFmDate()); |
| 151 | 152 | List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyModelQuery); |
| 152 | 153 | if (CollectionUtils.isEmpty(babyModels)) { |
| 153 | - handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1); | |
| 154 | + handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1,hospitalId); | |
| 154 | 155 | } else { |
| 155 | 156 | List<MaternalDeliverModel.Baby> babies = new ArrayList<>(); |
| 156 | 157 | for (BabyModel babyModel : babyModels) { |
| ... | ... | @@ -160,7 +161,7 @@ |
| 160 | 161 | maternalDeliverModel.setBaby(babies); |
| 161 | 162 | } |
| 162 | 163 | } |
| 163 | - String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 164 | + | |
| 164 | 165 | maternalDeliverModel.setHospitalId(hospitalId); |
| 165 | 166 | //做分娩的时候需要删除产筛数据 |
| 166 | 167 | SieveQuery sieveQuery = new SieveQuery(); |
| ... | ... | @@ -259,7 +260,7 @@ |
| 259 | 260 | babyModel.setfLevelId(patients.getHlevelTypeId()); |
| 260 | 261 | babyModel.setFcertNo(patients.getHcertificateNum()); |
| 261 | 262 | babyModel.setFcertTypeId(patients.getPcerteTypeId()); |
| 262 | - babyModel.setDeliverOrg(patients.getDeliverOrg()); | |
| 263 | +// babyModel.setDeliverOrg(patients.getDeliverOrg()); | |
| 263 | 264 | babyModel.setHospitalId(patients.getHospitalId()); |
| 264 | 265 | babyModel.setDueDate(patients.getDueDate()); |
| 265 | 266 | babyModel.setDueType(patients.getDueType()); |
| ... | ... | @@ -345,7 +346,7 @@ |
| 345 | 346 | * @param parentId |
| 346 | 347 | * @param userName |
| 347 | 348 | */ |
| 348 | - private void handBaby(MatDeliverAddRequest deliverAddRequest, List<MaternalDeliverModel.Baby> babyList, MaternalDeliverModel maternalDeliverModel, List<MatDeliverAddRequest.Baby> list, List<String> babyIds, String parentId, String userName, Patients patients) { | |
| 349 | + private void handBaby(MatDeliverAddRequest deliverAddRequest, List<MaternalDeliverModel.Baby> babyList, MaternalDeliverModel maternalDeliverModel, List<MatDeliverAddRequest.Baby> list, List<String> babyIds, String parentId, String userName, Patients patients,String hospital) { | |
| 349 | 350 | |
| 350 | 351 | |
| 351 | 352 | List babyName = buildBabyName(list); |
| ... | ... | @@ -355,7 +356,7 @@ |
| 355 | 356 | babyList.add(baby1); |
| 356 | 357 | //填充小孩基本信息 |
| 357 | 358 | BabyModel babyModel = fillBaby(patients); |
| 358 | - | |
| 359 | + babyModel.setDeliverOrg(hospital); | |
| 359 | 360 | baby.setId(baby1.getId()); |
| 360 | 361 | babyModel.setBirth(DateUtil.parseYMD(deliverAddRequest.getDueDate())); |
| 361 | 362 | babyModel.setYn(YnEnums.YES.getId()); |