diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java index 88993c7..937efde 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java @@ -98,11 +98,12 @@ public class PatientSerEnums { List list = new ArrayList<>(); Map resultMap = new HashMap<>(); resultMap.put("id", SerTypeEnums.bzfw.id); - resultMap.put("name", SerTypeEnums.bzfw.name()); - list.add(resultMap); - resultMap.put("id", SerTypeEnums.yqjzzd.id); - resultMap.put("name", SerTypeEnums.yqjzzd.name()); + resultMap.put("name", SerTypeEnums.bzfw.getTitle()); list.add(resultMap); + Map resultMap2 = new HashMap<>(); + resultMap2.put("id", SerTypeEnums.yqjzzd.id); + resultMap2.put("name", SerTypeEnums.yqjzzd.getTitle()); + list.add(resultMap2); return list; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 3093bab..705224e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.platform.biz.service.BabyService; import com.lyms.platform.biz.service.CommonService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.constants.ErrorCodeConstants; @@ -17,6 +18,7 @@ import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; import com.lyms.platform.operate.web.result.PatientSerResult; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; +import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.PatientsQuery; import net.sf.json.JSONObject; @@ -45,6 +47,8 @@ public class PatientServiceFacade { @Autowired private PatientsService patientsService; @Autowired + private BabyService babyService; + @Autowired private CommonService commonService; @Autowired private HospitalDoctServiceService hospitalDoctService; @@ -184,20 +188,34 @@ public class PatientServiceFacade { continue; } - Patients patients = patientsService.findOnePatientById(ps.getParentid()); - PatientService pser = new PatientService(); pser.setCreateUser(ps.getCreateUser()); pser.setCreateDate(ps.getCreateDate()); pser.setParentid(ps.getParentid()); - if (patients != null) { - pser.setPid(patients.getPid()); - //如果有数据源id,取主档案id - if(StringUtils.isNotEmpty(patients.getSource())){ - pser.setParentid(patients.getSource()); + //设置服务对象类型 服务人类型(1-孕妇、2-儿童) + pser.setPerType(ps.getPerType()); + if(ps.getPerType()!=null && ps.getPerType()==2){//儿童 + BabyModel babyModel = babyService.getOneBabyById(ps.getParentid()); + if (babyModel != null) { + pser.setPid(babyModel.getPid()); + //如果有数据源id,取主档案id + if(StringUtils.isNotEmpty(babyModel.getSource())){ + pser.setParentid(babyModel.getSource()); + } + } + }else{ + Patients patients = patientsService.findOnePatientById(ps.getParentid()); + if (patients != null) { + pser.setPid(patients.getPid()); + //如果有数据源id,取主档案id + if(StringUtils.isNotEmpty(patients.getSource())){ + pser.setParentid(patients.getSource()); + } } } + + pser.setId(UUID.randomUUID().toString().replace("-", "")); //开通医院 pser.setHospitalId(hospitalId); @@ -224,12 +242,15 @@ public class PatientServiceFacade { operateLogFacade.addAddOptLog(userId, Integer.valueOf(hospitalId), pser, OptActionEnums.ADD.getId(), "开通增值服务"); - if(PatientSerEnums.SerTypeEnums.yqjzzd.getId() == Integer.parseInt(serInfo.get("serType"))){//孕期精准指导同步到建档 + if(ps.getPerType()!=null&&ps.getPerType() == 2){//儿童建档服务数据处理 - YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest(); - yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); - bookbuildingFacade.updatePregnantById(ps.getParentid(),yunBookbuildingAddRequest, userId); + }else{//孕妇建档服务数据处理 + if(PatientSerEnums.SerTypeEnums.yqjzzd.getId() == Integer.parseInt(serInfo.get("serType"))){//孕期精准指导同步到建档 + YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest(); + yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); + yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); + bookbuildingFacade.updatePregnantById(ps.getParentid(),yunBookbuildingAddRequest, userId); + } } }