diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ConfigServiceController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ConfigServiceController.java index 8357b9c..93766fc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ConfigServiceController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ConfigServiceController.java @@ -10,6 +10,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.ConfigServiceFacade; import com.lyms.platform.operate.web.utils.CollectionUtils; +import com.lyms.platform.permission.model.HospitalDoctService; import com.lyms.platform.permission.model.HospitalServiceContent; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; @@ -63,10 +64,10 @@ public class ConfigServiceController extends BaseController { @ResponseBody @TokenRequired @RequestMapping(value = "/addOrUpdateHospSer", method = RequestMethod.POST) - public BaseResponse addOrUpdateHospitalService(HospitalServiceContent ps,HttpServletRequest request) { + public BaseResponse addOrUpdateHospitalService(HospitalServiceContent ps, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); try { - return configServiceFacade.addOrUpdateHospitalService(ps,loginState.getId()); + return configServiceFacade.addOrUpdateHospitalService(ps, loginState.getId()); } catch (Exception e) { e.printStackTrace(); BaseResponse baseResponse = new BaseResponse(); @@ -76,28 +77,42 @@ public class ConfigServiceController extends BaseController { } } + /** + * 新增或修改医生价格配置 + * + * @param hds 医生价格配置 + * @param request + * @return + */ + @ResponseBody + @TokenRequired + @RequestMapping(value = "/addOrUpdateHospDoctSer", method = RequestMethod.POST) + public BaseResponse addOrUpdateHosDoctService(HospitalDoctService hds, HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return configServiceFacade.addOrUpdateHosDoctService(hds, loginState.getId()); + } /** * 新增或修改服务开通记录 * - * @param ps 服务开通记录 - * @param isAutoDoct 是否自动生成专家咨询的服务的数据 - * @param hospitalName 医院名称 + * @param ps 服务开通记录 + * @param isAutoDoct 是否自动生成专家咨询的服务的数据 + * @param hospitalName 医院名称 * @param request * @return */ @ResponseBody @TokenRequired @RequestMapping(value = "/addOrUpdate", method = RequestMethod.POST) - public BaseResponse addOrUpdatePatientService(HospitalServiceContent ps,String hospitalName,boolean isAutoDoct, HttpServletRequest request) { + public BaseResponse addOrUpdatePatientService(HospitalServiceContent ps, String hospitalName, boolean isAutoDoct, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - if(StringUtils.isNotEmpty(hospitalName)){ + if (StringUtils.isNotEmpty(hospitalName)) { OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setName(hospitalName); - List organizations = organizationService.queryOrganization(organizationQuery); - if(CollectionUtils.isNotEmpty(organizations)){ + List organizations = organizationService.queryOrganization(organizationQuery); + if (CollectionUtils.isNotEmpty(organizations)) { Organization organization = organizations.get(0); ps.setHospitalId(String.valueOf(organization.getId())); } @@ -109,7 +124,7 @@ public class ConfigServiceController extends BaseController { if (baseResponse.getErrorcode() != ErrorCodeConstants.SUCCESS) { return baseResponse; } - return configServiceFacade.addHospitalService(ps,isAutoDoct, loginState.getId()); + return configServiceFacade.addHospitalService(ps, isAutoDoct, loginState.getId()); } catch (Exception e) { e.printStackTrace(); BaseResponse baseResponse = new BaseResponse(); @@ -160,18 +175,18 @@ public class ConfigServiceController extends BaseController { public BaseResponse validatePatient(HospitalServiceContent ps) { BaseResponse baseResponse = new BaseResponse(); //医院Id - if(StringUtils.isEmpty(ps.getHospitalId())){ + if (StringUtils.isEmpty(ps.getHospitalId())) { baseResponse.setErrormsg("请传入hospitalId"); baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); return baseResponse; } //服务价格 - if(ps.getSerType()==null){ + if (ps.getSerType() == null) { baseResponse.setErrormsg("请传入serType:1-孕期精准医疗、2-体重管理、3-血糖管理、4-血压管理、5-专家咨询、6-标准服务"); baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); return baseResponse; } - if(ps.getSerPrice()==null){ + if (ps.getSerPrice() == null) { baseResponse.setErrormsg("请传入serPrice服务价格"); baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); return baseResponse; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java index d22c07a..42ec42c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java @@ -107,13 +107,13 @@ public class ConfigServiceFacade { } /** - * 新增医院服务配置 + * 新增或修改医院服务配置 * * @param ps * @param userId 用户id * @return */ - public BaseResponse addOrUpdateHospitalService(HospitalServiceContent ps,Integer userId) throws Exception { + public BaseResponse addOrUpdateHospitalService(HospitalServiceContent ps, Integer userId) throws Exception { BaseResponse baseResponse = new BaseResponse(); //根据用户id获取医院ID @@ -125,6 +125,7 @@ public class ConfigServiceFacade { if (CollectionUtils.isNotEmpty(patientServices)) {//修改 HospitalServiceContent hospitalServiceContent = patientServices.get(0); hospitalServiceContent.setSyncStatus(0); + hospitalServiceContent.setStatus(ps.getStatus()); hospitalServiceContent.setSerPrice(ps.getSerPrice()); hospitalServiceContentService.updateHospitalServiceContent(hospitalServiceContent); } else { @@ -218,15 +219,15 @@ public class ConfigServiceFacade { } } //存放医生列表，医生ID和医生姓名 - Map docterMap = new HashMap<>(); + Map docterMap = new HashMap<>(); if (CollectionUtils.isNotEmpty(doctIds)) { UsersQuery usersQuery = new UsersQuery(); usersQuery.setIds(doctIds); List users = usersService.queryUsers(usersQuery); - if(CollectionUtils.isNotEmpty(users)){ - for(Users us:users){ - docterMap.put(us.getId(),us.getName()); + if (CollectionUtils.isNotEmpty(users)) { + for (Users us : users) { + docterMap.put(us.getId(), us.getName()); } } } @@ -237,12 +238,13 @@ public class ConfigServiceFacade { result.setId(hs.getId()); result.setDoctId(hs.getDoctId()); result.setDoctPrice(hs.getDoctPrice()); + result.setStatus(hs.getStatus()); if (StringUtils.isNum(hs.getDoctId())) { result.setDoctName(docterMap.get(Integer.parseInt(hs.getDoctId()))); } if (hs.getStatus() != null) { - result.setStatus(HospitalSerStatusEnums.getNameById(hs.getStatus())); + result.setStatusName(HospitalSerStatusEnums.getNameById(hs.getStatus())); } results.add(result); } @@ -351,4 +353,48 @@ public class ConfigServiceFacade { return baseResponse; } + /** + * 增加或修改服务医生配置 + * + * @param hds + * @param id + * @return + */ + public BaseResponse addOrUpdateHosDoctService(HospitalDoctService hds, Integer id) { + BaseResponse baseResponse = new BaseResponse(); + try { + if (StringUtils.isNotEmpty(hds.getId())) {//修改 + HospitalDoctService oldHosDoct = hospitalDoctService.getHospitalDoctService(hds.getId()); + //修改 + if (oldHosDoct != null) { + oldHosDoct.setStatus(hds.getStatus()); + oldHosDoct.setDoctPrice(hds.getDoctPrice()); + oldHosDoct.setSyncStatus(0); + hospitalDoctService.updateHospitalDoctService(oldHosDoct); + } + } else { + HospitalDoctServiceQuery doctServiceQuery = new HospitalDoctServiceQuery(); + doctServiceQuery.setHospServiceId(hds.getHospServiceId()); + doctServiceQuery.setDoctId(hds.getDoctId()); + List hospitalDoctServiceList = hospitalDoctService.queryHospitalDoctService(doctServiceQuery); + if (CollectionUtils.isNotEmpty(hospitalDoctServiceList)) { + HospitalDoctService hospitalDoctSer = hospitalDoctServiceList.get(0); + hospitalDoctSer.setStatus(hds.getStatus()); + hospitalDoctSer.setDoctPrice(hds.getDoctPrice()); + hospitalDoctSer.setSyncStatus(0); + hospitalDoctService.updateHospitalDoctService(hospitalDoctSer); + } else { + hds.setId(UUID.randomUUID().toString().replace("-", "")); + hds.setSyncStatus(0); + hospitalDoctService.addHospitalDoctService(hds); + } + } + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + } catch (Exception e) { + baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); + baseResponse.setErrormsg(e.getMessage()); + e.printStackTrace(); + } + return baseResponse; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalDoctSerResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalDoctSerResult.java index 3353ae4..652638b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalDoctSerResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalDoctSerResult.java @@ -40,7 +40,12 @@ public class HospitalDoctSerResult { /** * 状态：0-有效、1-暂停、2-删除 */ - private String status; + private String statusName; + + /** + * 状态：1-有效、2-暂停、3-删除 + */ + private Integer status; public String getDoctName() { return doctName; @@ -98,11 +103,19 @@ public class HospitalDoctSerResult { this.doctPrice = doctPrice; } - public String getStatus() { + public String getStatusName() { + return statusName; + } + + public void setStatusName(String statusName) { + this.statusName = statusName; + } + + public Integer getStatus() { return status; } - public void setStatus(String status) { + public void setStatus(Integer status) { this.status = status; } }