Commit 45bb5599a41ff766b614946027d1983a860cd94d
1 parent
f12a24867f
Exists in
master
and in
6 other branches
复诊修改优化
Showing 2 changed files with 4 additions and 5 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
View file @
45bb559
| ... | ... | @@ -172,7 +172,7 @@ |
| 172 | 172 | } |
| 173 | 173 | } |
| 174 | 174 | } |
| 175 | - //updatePatientOneCol(id, com.lyms.platform.common.utils.StringUtils.isEmpty(nextCheckTime) == true ? null : DateUtil.parseYMD(nextCheckTime)); | |
| 175 | + updatePatientOneCol(id, com.lyms.platform.common.utils.StringUtils.isEmpty(nextCheckTime) == true ? null : DateUtil.parseYMD(nextCheckTime)); | |
| 176 | 176 | } |
| 177 | 177 | } |
| 178 | 178 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
45bb559
| ... | ... | @@ -387,15 +387,14 @@ |
| 387 | 387 | if (null != patients.getBuildType() && patients.getBuildType() == 3) { |
| 388 | 388 | ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); |
| 389 | 389 | referralApplyOrderQuery.setParentId(patients.getId()); |
| 390 | - String hospital = autoMatchFacade.getHospitalId(userId); | |
| 391 | - referralApplyOrderQuery.setHospitalId(hospital); | |
| 390 | + referralApplyOrderQuery.setHospitalId(hospitalId); | |
| 392 | 391 | referralApplyOrderQuery.setStatus(1); |
| 393 | 392 | List<ReferralApplyOrderModel> orderModelList = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); |
| 394 | 393 | if (CollectionUtils.isNotEmpty(orderModelList)) { |
| 395 | 394 | String outHospitalId = orderModelList.get(0).getOutHospitalId(); |
| 396 | 395 | ReferralApplyOrderQuery referralApplyOrderQuery1 = new ReferralApplyOrderQuery(); |
| 397 | 396 | referralApplyOrderQuery1.setOutHospitalId(outHospitalId); |
| 398 | - referralApplyOrderQuery1.setTransferredHospital(hospital); | |
| 397 | + referralApplyOrderQuery1.setTransferredHospital(hospitalId); | |
| 399 | 398 | referralApplyOrderQuery1.setPid(patients.getPid()); |
| 400 | 399 | referralApplyOrderQuery1.setStatus(1); |
| 401 | 400 | ReferralApplyOrderModel model1 = new ReferralApplyOrderModel(); |
| ... | ... | @@ -406,7 +405,7 @@ |
| 406 | 405 | model1.setStatus(2); |
| 407 | 406 | applyOrderService.updateByParentId(referralApplyOrderQuery1, model1); |
| 408 | 407 | ReferralApplyOrderQuery referralApplyOrderQuery2 = new ReferralApplyOrderQuery(); |
| 409 | - referralApplyOrderQuery2.setOutHospitalId(hospital); | |
| 408 | + referralApplyOrderQuery2.setOutHospitalId(hospitalId); | |
| 410 | 409 | referralApplyOrderQuery2.setTransferredHospital(outHospitalId); |
| 411 | 410 | referralApplyOrderQuery2.setPid(patients.getPid()); |
| 412 | 411 | referralApplyOrderQuery2.setStatus(1); |