diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java index 07984a0..3d2c129 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java @@ -1,6 +1,8 @@ package com.lyms.platform.permission.model; import java.util.Date; +import java.util.List; +import java.util.Map; public class PatientService { @@ -18,9 +20,9 @@ public class PatientService { */ private Integer serType; /** - * 服务类型(1-孕期精准医疗、2-体重管理、3-血糖管理、4-血压管理、5-专家咨询、6-标准服务) + * 服务信息 */ - private String serTypes; + private List> serInfos; /** * 指定医生 */ @@ -106,12 +108,12 @@ public class PatientService { this.orderId = orderId; } - public String getSerTypes() { - return serTypes; + public List> getSerInfos() { + return serInfos; } - public void setSerTypes(String serTypes) { - this.serTypes = serTypes; + public void setSerInfos(List> serInfos) { + this.serInfos = serInfos; } public Date getBackDate() { 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 422ef2a..f067468 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 @@ -176,14 +176,8 @@ public class PatientServiceController extends BaseController { return baseResponse; } //serType服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询) - if(ps.getSerTypes()==null){ - baseResponse.setErrormsg("请传入serTypes"); - baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); - return baseResponse; - } - //指定医生 - if(ps.getSerDoct()==null){ - baseResponse.setErrormsg("请传入serDoct"); + if(ps.getSerInfos()==null){ + baseResponse.setErrormsg("请传入serInfos"); baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); return baseResponse; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java index 8c83026..eaa931b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java @@ -1048,6 +1048,7 @@ public class PatientMarkHospServiceFacade { } else if (patientMarkRequest.getType() == 3) {//3-住院提醒 //回院提醒状态为已提醒 patientMarkHospQuery.setBackStatus(2); + patientMarkHospQuery.setIsReality(patientMarkRequest.getIsReality()); patientMarkHospQuery.setBackResult(1); patientMarkHospQuery.setInHospitResult(patientMarkRequest.getResult()); if (patientMarkRequest.getFailure() != null) { 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 28a7db6..42b8e45 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 @@ -128,15 +128,16 @@ public class PatientServiceFacade { public BaseResponse addPatientService(PatientService ps, Integer id) throws Exception { //根据用户id获取医院ID String hospitalId = autoMatchFacade.getHospitalId(id); - String[] serTypes = ps.getSerTypes().split(","); + List> serInfos = ps.getSerInfos(); + List patientServiceList = new ArrayList<>(); - for (String psType : serTypes) { + for (Map serInfo : serInfos) { //先根据孕妇id和开通服务类型、开通医生进行查询,如果已经开通过则开通失败 PatientServiceQuery patientQuery = new PatientServiceQuery(); patientQuery.setHospitalId(hospitalId); patientQuery.setParentid(ps.getParentid()); - patientQuery.setSerType(Integer.parseInt(psType)); - patientQuery.setSerDoct(ps.getSerDoct()); + patientQuery.setSerType(Integer.parseInt(serInfo.get("serType"))); + List patientServices = patientServiceService.queryPatientService(patientQuery); if (CollectionUtils.isNotEmpty(patientServices)) { @@ -153,7 +154,10 @@ public class PatientServiceFacade { //默认开通状态 ps.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId()); //服务类型 - ps.setSerType(Integer.parseInt(psType)); + ps.setSerType(Integer.parseInt(serInfo.get("serType"))); + if(serInfo.containsKey(serInfo.get("serDoct"))){ + ps.setSerDoct(serInfo.get("serDoct")); + } //默认已经领取 ps.setStatus(2); //默认待同步 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientMarkRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientMarkRequest.java index cce910a..2b22788 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientMarkRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientMarkRequest.java @@ -45,6 +45,18 @@ public class PatientMarkRequest extends BasePageQueryRequest { * 查询号 */ private String queryNo; + /** + * 是否实际住院 1-是,2-否 + */ + private Integer isReality; + + public Integer getIsReality() { + return isReality; + } + + public void setIsReality(Integer isReality) { + this.isReality = isReality; + } public String getQueryNo() { return queryNo;