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 a879ee3..4c2545d 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 @@ -184,11 +184,12 @@ public class SmsConfigController extends BaseController { @RequestParam(required = false) String phone, @RequestParam(required = false) Integer smsType, @RequestParam(required = false) Integer smsStatus, + @RequestParam(required = false) Integer objType, @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); + return smsConfigFacade.querySmsList(hospitalId, phone, smsType, smsStatus, content,planTime,actualTime,objType, page, limit); } } 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 7302a1a..e31ce03 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 @@ -1162,7 +1162,7 @@ public class BabyBookbuildingFacade { Patients patients = patientsService.findOnePatientByCardNo(puerperaQuery); map.put("patients", patients); map.put("records",results); - map.put("buildInfo",buildInfo); + map.put("buildInfo",getBabyBuildResult(buildInfo)); map.put("isCurrentHospBuild",isCurrentHosp); BaseObjectResponse objectResponse = new BaseObjectResponse(); 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 9aecca5..a86ca28 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 @@ -631,7 +631,7 @@ public class SmsConfigFacade { return objectResponse; } - public BaseListResponse querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTime,String actualTime, Integer page, Integer limit) + public BaseListResponse querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTime,String actualTime,Integer objType, Integer page, Integer limit) { String planTimeStart = ""; String planTimeEnd = ""; @@ -651,7 +651,7 @@ public class SmsConfigFacade { } List> list = new ArrayList<>(); - SmsResult sms = MessageCenterService.querySmsList(hospitalId, phone, smsType, smsStatus, content, planTimeStart, planTimeEnd, actualTimeStart, actualTimeEnd, page, limit); + SmsResult sms = MessageCenterService.querySmsList(hospitalId, phone, smsType, smsStatus, content, planTimeStart, planTimeEnd, actualTimeStart, actualTimeEnd,objType, page, limit); if (sms != null && sms.getList() != null ) { @@ -676,6 +676,7 @@ public class SmsConfigFacade { map.put("smsType",SmsServiceEnums.getSmsServiceById(obj.getSubTypeId())); map.put("phone",obj.getPhone()); map.put("content",obj.getContent()); + map.put("objType",ServiceObjEnums.getServiceObjById(obj.getObjType())); if (obj.getPlanTime() != null && obj.getPlanTime() > 0) { 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 b2dfcc5..149c3c8 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 @@ -68,11 +68,11 @@ public class MessageCenterService { } - public static SmsResult querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTimeStart,String planTimeEnd,String actualTimeStart,String actualTimeEnd, Integer page, Integer limit) + public static SmsResult querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTimeStart,String planTimeEnd,String actualTimeStart,String actualTimeEnd,Integer objType ,Integer page, Integer limit) { String param = "typeId=4&ext1="+StringUtils.emptyStr(hospitalId)+"&phone="+StringUtils.emptyStr(phone)+"&subTypeId="+StringUtils.emptyInt(smsType)+"&content="+StringUtils.emptyStr(content)+ "&planTimeStart="+planTimeStart+"&planTimeEnd="+planTimeEnd+"&actualTimeStart="+actualTimeStart+ - "&actualTimeEnd="+actualTimeEnd+"&status="+StringUtils.emptyInt(smsStatus)+"&page="+page+"&limit="+limit; + "&actualTimeEnd="+actualTimeEnd+"&status="+StringUtils.emptyInt(smsStatus)+"&objType="+StringUtils.emptyInt(objType)+"&page="+page+"&limit="+limit; String result = HttpRequest.sendGet(CENTER_BASE_URL+"messages", param, CENTER_TOKEN); // SmsResult map = new SmsResult(); // String result = HttpRequest.sendGet("http://192.168.5.6:8080/v1/messages", param, "YMer2016");