Commit d8154576827232ec9bb60ceae7cb634e664060f2
1 parent
ff0d9b9307
Exists in
master
修改产检删除
Showing 1 changed file with 8 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
d815457
... | ... | @@ -202,19 +202,23 @@ |
202 | 202 | } |
203 | 203 | referralApplyOrderModel.setDays(DateUtil.getBabyMonthAge1(babyModel.getBirth(), new Date())); |
204 | 204 | referralApplyOrderModel.setDueWeek(new Date()); |
205 | - Patients patients = patientsService.findOnePatientById(babyModel.getParentId()); | |
205 | + if(StringUtils.isNotEmpty(babyModel.getParentId())){ | |
206 | + Patients patients = patientsService.findOnePatientById(babyModel.getParentId()); | |
207 | + referralApplyOrderModel.setMname(patients.getUsername()); | |
208 | + referralApplyOrderModel.setPhone(patients.getPhone()); | |
209 | + referralApplyOrderModel.setmCardNo(patients.getCardNo()); | |
210 | + } | |
206 | 211 | referralApplyOrderModel.setParentId(babyModel.getId()); |
207 | - referralApplyOrderModel.setMname(patients.getUsername()); | |
208 | 212 | referralApplyOrderModel.setAge(DateUtil.getAge(babyModel.getBirth())); |
209 | 213 | referralApplyOrderModel.setBirth(babyModel.getBirth()); |
210 | 214 | referralApplyOrderModel.setDueDate(babyModel.getDueDate()); |
211 | 215 | referralApplyOrderModel.setName(babyModel.getName()); |
212 | - referralApplyOrderModel.setPhone(patients.getPhone()); | |
216 | + | |
213 | 217 | referralApplyOrderModel.setSex(babyModel.getSex()); |
214 | 218 | referralApplyOrderModel.setCardNo(babyModel.getCardNo()); |
215 | 219 | referralApplyOrderModel.setExpVip(babyModel.getExpVip()); |
216 | 220 | referralApplyOrderModel.setPid(babyModel.getPid()); |
217 | - referralApplyOrderModel.setmCardNo(patients.getCardNo()); | |
221 | + | |
218 | 222 | referralApplyOrderModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); |
219 | 223 | List<String> diagnoseList = babyCheckFacade.getBabyLastDiagnose(babyModel.getPid()); |
220 | 224 | List lsit = new ArrayList(); |