diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/StopPregModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/StopPregModel.java index 128ff5a..5cda73b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/StopPregModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/StopPregModel.java @@ -35,6 +35,16 @@ public class StopPregModel extends BaseModel { private String hospitalId; + private String pid; + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + 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 60c1152..22f570c 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 @@ -134,7 +134,7 @@ public class SmsConfigController extends BaseController { @RequestParam(required = true) String hid, @RequestParam(required = true) String highConfig, @RequestParam(required = true) Integer status) { - return smsConfigFacade.addOrUpdateHospitalConfig(hospitalName,shortCode,provinceId,cityId,areaId,address,remark, + return smsConfigFacade.addOrUpdateHospitalConfig(hospitalName, shortCode, provinceId, cityId, areaId, address, remark, hid, highConfig, status); } @@ -175,4 +175,20 @@ public class SmsConfigController extends BaseController { ) { return smsConfigFacade.queryConfigHospitals(hospitalName,provinceId, cityId, areaId, status,page,limit); } + + + + @RequestMapping(value = "/querySmsList", method = RequestMethod.GET) + @ResponseBody + public BaseResponse querySmsList(@RequestParam(required = false) String hospitalId, + @RequestParam(required = false) String phone, + @RequestParam(required = false) Integer smsType, + @RequestParam(required = false) Integer smsStatus, + @RequestParam(required = false) String content, + @RequestParam(required = false) String planTime, + @RequestParam(required = false) String actualTime, + @RequestParam(required = false) Integer page, + @RequestParam(required = false) Integer limit) { + return smsConfigFacade.querySmsList(hospitalId, phone, smsType, smsStatus, content,planTime,actualTime, page, limit); + } } 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 aa9b218..725c841 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 @@ -628,4 +628,9 @@ public class SmsConfigFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + public BaseObjectResponse querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTime,String actualTime, Integer page, Integer limit) + { + return null; + } } \ 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 5279d53..7e6ebb4 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 @@ -182,7 +182,7 @@ public class StopPregnancyFacade { private StopPregModel getStopPregModel(StopPregRequest request) { StopPregModel model = new StopPregModel(); - + model.setPid(request.getPid()); model.setYn(YnEnums.YES.getId()); model.setInPerson(request.getInPerson()); model.setRemark(request.getRemark()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java index 6dfc021..1bcbcf6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java @@ -61,4 +61,20 @@ public class MessageCenterService { return false; } + + public static List querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTime,String actualTime, Integer page, Integer limit) + { +//// String result = HttpRequest.sendPost(CENTER_BASE_URL + "messages/{" + hid + "}", json, CENTER_TOKEN); +// String result = HttpRequest.sendGet("http://192.168.5.13:8080/v1/messages/" + hid, json, "YMer2016"); +// if (StringUtils.isNotEmpty(result)) +// { +// Map map = JsonUtil.str2Obj(result, Map.class); +// if ("0".equals(map.get("errorcode"))) +// { +// return true; +// } +// } +// return false; + return null; + } }