diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java index f9a4458..5a36585 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java @@ -47,6 +47,27 @@ public class SmsConfigModel extends BaseModel { //医院ID private String hospitalId; + //高危配置 + private String highConfig; + //运行状态 0运行 1试运行 2停止 + private Integer status; + + public String getHighConfig() { + return highConfig; + } + + public void setHighConfig(String highConfig) { + this.highConfig = highConfig; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + public String getHospitalId() { return hospitalId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java index 0644482..dde0016 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java @@ -103,4 +103,14 @@ public class SmsConfigController extends BaseController { return list; } + + /** + * 查询医院 + * @return + */ + @RequestMapping(value = "/queryHospitalConfig/{hid}", method = RequestMethod.GET) + @ResponseBody + public BaseResponse queryHospitalConfig(@PathVariable("hid") String hid) { + return smsConfigFacade.queryHospitalConfig(hid); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java index 0d2c7a2..dba8a72 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java @@ -13,7 +13,9 @@ import com.lyms.platform.operate.web.request.SmsConfigRequest; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.permission.model.Departments; import com.lyms.platform.permission.model.DepartmentsQuery; +import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.DepartmentsService; +import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import com.qiniu.util.Json; @@ -35,6 +37,9 @@ public class SmsConfigFacade { @Autowired private DepartmentsService departmentsService; + @Autowired + private OrganizationService organizationService; + /** * 更新短信服务配置 * @param request @@ -317,4 +322,59 @@ public class SmsConfigFacade { } return sr; } + + /** + * 查询医院基础配置 + * @param hid + * @return + */ + public BaseResponse queryHospitalConfig(String hid) { + Map hospital = new HashMap<>(); + Organization org = organizationService.getOrganization(Integer.parseInt(hid)); + if (org != null) + { + hospital.put("hospitalName",org.getName()); + hospital.put("shortCode",org.getShortCode()); + String allAddress = ""; + String provinceId = org.getProvinceId(); + if (StringUtils.isNotEmpty(provinceId)) + { + + } + String areaId = org.getAreaId(); + if (StringUtils.isNotEmpty(provinceId)) + { + + } + String cityId = org.getCityId(); + if (StringUtils.isNotEmpty(provinceId)) + { + + } + String address = org.getAddress(); + allAddress+=address; + hospital.put("address",allAddress); + + hospital.put("remark",""); + } + SmsConfigQuery query = new SmsConfigQuery(); + query.setYn(YnEnums.YES.getId()); + query.setHospitalId(hid); + List smsmodels = smsConfigService.querySmsConfigByHid(query); + if (CollectionUtils.isNotEmpty(smsmodels)) + { + SmsConfigModel model = smsmodels.get(0); + if (model != null) + { + hospital.put("highConfig",model.getHighConfig()); + hospital.put("status",model.getStatus()+""); + } + + } + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(hospital); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java index 1b6358b..410e8ab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -224,18 +224,19 @@ public class StopPregnancyFacade { usersQuery.setYn(YnEnums.YES.getId()); usersQuery.setOrgId(hospitalId); List users = usersService.queryUsers2(usersQuery); - Map pmap = new HashMap(); + List list = new ArrayList<>(); if (CollectionUtils.isNotEmpty(users)) { for(Users user : users) { + Map pmap = new HashMap(); pmap.put("id",user.getId()); pmap.put("name",user.getName()); + list.add(pmap); } } - BaseObjectResponse objectResponse = new BaseObjectResponse(); - objectResponse.setData(pmap); + objectResponse.setData(list); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); return objectResponse; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java index ac57772..c60ffdb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java @@ -35,6 +35,19 @@ public class SmsConfigRequest { private String hospitalId; + //高危配置 + private String highConfig; + //运行状态 0运行 1试运行 2停止 + private Integer status; + + public String getHighConfig() { + return highConfig; + } + + public void setHighConfig(String highConfig) { + this.highConfig = highConfig; + } + public String getHospitalId() { return hospitalId; }