diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/matnRehabPC/service/impl/MatnRehabServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/matnRehabPC/service/impl/MatnRehabServiceImpl.java index 27fff40..eefffeb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/matnRehabPC/service/impl/MatnRehabServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/matnRehabPC/service/impl/MatnRehabServiceImpl.java @@ -70,38 +70,38 @@ public class MatnRehabServiceImpl implements MatnRehabService { MaternalDeliverModel model = queryList.get(0); baseObjectResponse =viewFacade.findMatDeliverData(model.getId()); if(baseObjectResponse.getData() !=null){ + Map data = (Map) baseObjectResponse.getData(); // 查体重表 给营养报告用 List patientWeights = patientWeightService2.queryPatientWeight(Query.query(Criteria.where("patientId").is(patients.getId()))); if(CollectionUtils.isNotEmpty(patientWeights)){ PatientWeight patientWeight= patientWeights.get(0); - Map data = (Map) baseObjectResponse.getData(); data.put("patientWeight",patientWeight); - MedicalRecordVo medicalRecordVo = new MedicalRecordVo(); - medicalRecordVo.setCardNo(patients.getCardNo()); - // 诊断手术赋值 - List list = appointmentService.queryList(medicalRecordVo); - if(CollectionUtils.isNotEmpty(list)){ - MedicalRecordVo medicalRecordVo1 = list.get(0); - data.put("diagnosis",medicalRecordVo1.getDiagnosis()); - data.put("operation",medicalRecordVo1.getOperation()); - } + } - // 查询服务是否开通 - List patientServices = patientServiceService.getServiceListByParentId(patients.getId(),3); - if(CollectionUtils.isNotEmpty(patientServices)){ - for (PatientService patientService : patientServices) { - // 产后康复服务对应码值 - if(patientService.getSerType()==20){ - data.put("serStatus","1"); - } - } + MedicalRecordVo medicalRecordVo = new MedicalRecordVo(); + medicalRecordVo.setCardNo(patients.getCardNo()); + // 诊断手术赋值 + List list = appointmentService.queryList(medicalRecordVo); + if(CollectionUtils.isNotEmpty(list)){ + MedicalRecordVo medicalRecordVo1 = list.get(0); + data.put("diagnosis",medicalRecordVo1.getDiagnosis()); + data.put("operation",medicalRecordVo1.getOperation()); + } + // 查询服务是否开通 + List patientServices = patientServiceService.getServiceListByParentId(patients.getId(),3); + if(CollectionUtils.isNotEmpty(patientServices)){ + for (PatientService patientService : patientServices) { + // 产后康复服务对应码值 + if(patientService.getSerType()==20){ + data.put("serStatus","1"); + } } - baseObjectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); - baseObjectResponse.setErrormsg("成功"); - baseObjectResponse.setData(data); } + baseObjectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + baseObjectResponse.setErrormsg("成功"); + baseObjectResponse.setData(data); } return baseObjectResponse;