diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java index fe0d9fd..4bb5f6f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java @@ -7,6 +7,7 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.PatientServiceFacade; import com.lyms.platform.operate.web.request.BasePageQueryRequest; import com.lyms.platform.permission.model.PatientService; @@ -27,6 +28,8 @@ public class PatientServiceController extends BaseController { @Autowired private PatientServiceFacade patientServiceFacade; + @Autowired + private AutoMatchFacade autoMatchFacade; /** * 初始化接口 @@ -99,7 +102,9 @@ public class PatientServiceController extends BaseController { if (baseResponse.getErrorcode() != ErrorCodeConstants.SUCCESS) { return baseResponse; } - return patientServiceFacade.addPatientService(ps, loginState.getId()); + //根据用户id获取医院ID + String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); + return patientServiceFacade.addPatientService(ps, loginState.getId(),hospitalId); } else { return patientServiceFacade.updatePatientService(ps, loginState.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 960d84d..0fd64d1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -722,7 +722,7 @@ public class BabyBookbuildingFacade { patientService.setParentid(model.getId()); patientService.setPid(model.getPid()); try { - patientServiceFacade.addPatientService(patientService, userId); + patientServiceFacade.addPatientService(patientService, userId,request.getHospitalId()); } catch (Exception e) { System.out.println("儿童建档服务开通异常!"); e.printStackTrace(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index cfb08b7..9fc76b8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -344,7 +344,7 @@ public class BookbuildingFacade { patientService.setCreateDate(DateUtil.parseYMD(yunRequest.getBookbuildingDate())); patientService.setParentid(p.getId()); try { - patientServiceFacade.addPatientService(patientService, userId); + patientServiceFacade.addPatientService(patientService, userId,yunRequest.getHospitalId()); } catch (Exception e) { System.out.println("孕妇建档服务开通异常!"); e.printStackTrace(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HosptialHighRiskFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HosptialHighRiskFacade.java index 085b9ed..1cf678b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HosptialHighRiskFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HosptialHighRiskFacade.java @@ -71,7 +71,6 @@ public class HosptialHighRiskFacade { */ public BaseResponse addHosptialHighRisk(HosptialHighRisk hosptialHighRisk, int userId) { - String hospitalId = autoMatchFacade.getHospitalId(userId); HosptialHighRiskQuery hosptialHighRiskQuery = new HosptialHighRiskQuery(); hosptialHighRiskQuery.setHospitalId(hospitalId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 9bf7646..d940c51 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -15,6 +15,7 @@ import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; +import com.lyms.platform.permission.model.PatientService; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; @@ -95,6 +96,9 @@ public class MatDeliverFacade { @Autowired private OperateLogFacade operateLogFacade; + @Autowired + private PatientServiceFacade patientServiceFacade; + private static Map ONE_ENUMS = new HashMap<>(); @@ -434,8 +438,8 @@ public class MatDeliverFacade { babyModel.setDueDate(patients.getDueDate()); babyModel.setDueType(patients.getDueType()); babyModel.setBuildDoctor("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29"); - babyModel.setServiceStatus(patients.getServiceStatus()); - babyModel.setServiceType(patients.getServiceType()); + babyModel.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); + babyModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); babyModel.setCreated(new Date()); babyModel.setModified(new Date()); if (null != deliverAddRequest.getDueDate()) { @@ -647,13 +651,37 @@ public class MatDeliverFacade { } babyIds.add(babyService.addOneBaby(babyModel).getId()); baby1.setId(babyModel.getId()); + + //儿童分娩自动建档开通增值服务 + if (babyModel.getServiceType()!=null) { + PatientService patientService = new PatientService(); + patientService.setPerType(2); + List> serInfos = new ArrayList<>(); + Map serMap = new HashMap<>(); + serMap.put("serType",String.valueOf(PatientSerEnums.SerTypeEnums.babyBzfw.getId())); + serInfos.add(serMap); + patientService.setSerInfos(serInfos); + patientService.setCreateUser(String.valueOf("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29")); + //开通日期与建档日期一致 + patientService.setCreateDate(new Date()); + patientService.setParentid(babyModel.getId()); + patientService.setPid(babyModel.getPid()); + try { + patientServiceFacade.addPatientService(patientService, Integer.parseInt(patients.getBookbuildingDoctor()),babyModel.getHospitalId()); + } catch (Exception e) { + System.out.println("儿童建档服务开通异常!"); + e.printStackTrace(); + } + } + + if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { ExceptionUtils.catchException("分娩---------->" + babyModel.getMphone() + ";name=" + babyModel.getName()); //儿童建档 // babyBookbuildingFacade.createBuildSms(babyModel); babyBookbuildingFacade.createBuildMsg(babyModel); - //业务推广短信 - babyBookbuildingFacade.createExtensionMsg(babyModel); + //业务推广短信,应为服务开通出会调用发送推广短信 + // babyBookbuildingFacade.createExtensionMsg(babyModel); } 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 a7009a1..788f4b9 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 @@ -180,11 +180,8 @@ public class PatientServiceFacade { * @param userId * @return */ - public BaseResponse addPatientService(PatientService ps, Integer userId) throws Exception { - //根据用户id获取医院ID - String hospitalId = autoMatchFacade.getHospitalId(userId); + public BaseResponse addPatientService(PatientService ps, Integer userId,String hospitalId) throws Exception { List> serInfos = ps.getSerInfos(); - for (Map serInfo : serInfos) { //先根据孕妇id和开通服务类型、开通医生进行查询,如果已经开通过则开通失败 PatientServiceQuery patientQuery = new PatientServiceQuery();