Commit b73b58ee960179af9cc703b788ff5544c2addf91
1 parent
a04ed04d33
Exists in
master
and in
1 other branch
修改新电子病历
Showing 1 changed file with 11 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
b73b58e
| ... | ... | @@ -96,7 +96,8 @@ |
| 96 | 96 | |
| 97 | 97 | /* List<ReferralApplyOrderModel> list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); |
| 98 | 98 | if (CollectionUtils.isEmpty(list)) {*/ |
| 99 | - if (2 == type) { | |
| 99 | + String id=""; | |
| 100 | + if (2 == type) { | |
| 100 | 101 | //查询产妇信息 |
| 101 | 102 | List<Patients> patientses = patientsService.queryPatient(patientsQuery); |
| 102 | 103 | Patients patients = null; |
| 103 | 104 | |
| 104 | 105 | |
| ... | ... | @@ -122,11 +123,13 @@ |
| 122 | 123 | referralApplyOrderModel.setPid(patients.getPid()); |
| 123 | 124 | referralApplyOrderModel.setDueWeek(days); |
| 124 | 125 | referralApplyOrderModel.setServiceType(patients.getServiceType()); |
| 126 | + id=patients.getId(); | |
| 125 | 127 | if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) { |
| 126 | 128 | |
| 127 | 129 | PatientsQuery patientsQuery1 = new PatientsQuery(); |
| 128 | - patientsQuery1.setId(patients.getId()); | |
| 130 | + patientsQuery1.setPid(patients.getPid()); | |
| 129 | 131 | patientsQuery1.setYn(YnEnums.YES.getId()); |
| 132 | + patientsQuery1.setType(patients.getType()); | |
| 130 | 133 | patientsQuery1.setHospitalId(referralApplyOrderModel.getTransferredHospital()); |
| 131 | 134 | if (patientsService.queryPatientCount(patientsQuery1) == 0) { |
| 132 | 135 | //在转入的医院建档 |
| 133 | 136 | |
| 134 | 137 | |
| ... | ... | @@ -135,13 +138,15 @@ |
| 135 | 138 | patients.setBookbuildingDate(new Date()); |
| 136 | 139 | patients.setBookbuildingDoctor(null); |
| 137 | 140 | patients.setBuildType(2); |
| 138 | - patientsService.addPatient(patients); | |
| 141 | + id=patientsService.addPatient(patients).getId(); | |
| 139 | 142 | } |
| 140 | 143 | } |
| 141 | 144 | } |
| 142 | 145 | } else { |
| 146 | + | |
| 143 | 147 | BabyModel babyModel = babyService.getOneBabyById(referralApplyOrderModel.getParentId()); |
| 144 | 148 | if (null != babyModel) { |
| 149 | + id=babyModel.getId(); | |
| 145 | 150 | if (null != babyModel.getBirth()) { |
| 146 | 151 | referralApplyOrderModel.setAge(DateUtil.getAge(babyModel.getBirth())); |
| 147 | 152 | referralApplyOrderModel.setDueWeek(DateUtil.getDays(babyModel.getBirth(), new Date())); |
| ... | ... | @@ -162,7 +167,7 @@ |
| 162 | 167 | referralApplyOrderModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); |
| 163 | 168 | if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) { |
| 164 | 169 | BabyModelQuery babyModelQuery = new BabyModelQuery(); |
| 165 | - babyModelQuery.setId(babyModel.getId()); | |
| 170 | + babyModelQuery.setPid(babyModel.getPid()); | |
| 166 | 171 | babyModelQuery.setHospitalId(referralApplyOrderModel.getTransferredHospital()); |
| 167 | 172 | babyModelQuery.setYn(YnEnums.YES.getId()); |
| 168 | 173 | //没有儿童档案的时候才建档 |
| ... | ... | @@ -174,7 +179,7 @@ |
| 174 | 179 | babyModel.setBuildDate(new Date()); |
| 175 | 180 | babyModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); |
| 176 | 181 | babyModel.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); |
| 177 | - babyService.addOneBaby(babyModel); | |
| 182 | + id =babyService.addOneBaby(babyModel).getId(); | |
| 178 | 183 | } |
| 179 | 184 | } |
| 180 | 185 | } |
| ... | ... | @@ -187,6 +192,7 @@ |
| 187 | 192 | applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel); |
| 188 | 193 | |
| 189 | 194 | referralApplyOrderModel.setId(null); |
| 195 | + referralApplyOrderModel.setParentId(id); | |
| 190 | 196 | referralApplyOrderModel.setHospitalId(referralApplyOrderModel.getTransferredHospital()); |
| 191 | 197 | |
| 192 | 198 | applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel); |