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 4c2545d..b0f5a10 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 @@ -180,7 +180,7 @@ public class SmsConfigController extends BaseController { @RequestMapping(value = "/querySmsList", method = RequestMethod.GET) @ResponseBody - public BaseResponse querySmsList(@RequestParam(required = false) String hospitalId, + public BaseResponse querySmsList(@RequestParam(required = false) String hospitalName, @RequestParam(required = false) String phone, @RequestParam(required = false) Integer smsType, @RequestParam(required = false) Integer smsStatus, @@ -190,6 +190,6 @@ public class SmsConfigController extends BaseController { @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,objType, page, limit); + return smsConfigFacade.querySmsList(hospitalName, 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 e31ce03..a52d4d3 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 @@ -702,7 +702,7 @@ public class BabyBookbuildingFacade { bm.setServiceType(b.getServiceType()); bm.setVcCardNo(b.getVcCardNo()); bm.setHospitalId(b.getHospitalId()); - bm.setApgarScore(JsonUtil.obj2JsonString(b.getApgar())); + bm.setApgarScore(JsonUtil.obj2JsonString(b.getApgarScore())); if (b.getHighRisk() == null) { bm.setLastHighRisk(0); @@ -834,7 +834,7 @@ public class BabyBookbuildingFacade { result.setBabyHead(model.getBabyHead()); result.setDeliverOrg(model.getDeliverOrg()); result.setMalformation(model.getMalformation()); - result.setApgar(JsonUtil.str2Obj(model.getApgarScore(), Map.class)); + result.setApgarScore(JsonUtil.str2Obj(model.getApgarScore(), Map.class)); result.setHighRisk(model.getHighRisk()); 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 a86ca28..c9eeaac 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,8 +631,34 @@ public class SmsConfigFacade { return objectResponse; } - public BaseListResponse querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTime,String actualTime,Integer objType, Integer page, Integer limit) + public BaseListResponse querySmsList(String hospitalName, String phone,Integer smsType,Integer smsStatus,String content,String planTime,String actualTime,Integer objType, Integer page, Integer limit) { + + OrganizationQuery organizationQuery = new OrganizationQuery(); + + organizationQuery.setYn(YnEnums.YES.getId()); + organizationQuery.setKeyword(hospitalName); + + + String hospitalIds = ""; + List orgs = organizationService.queryHospitals(organizationQuery); + if (CollectionUtils.isNotEmpty(orgs)) + { + for(int i = 0 ; i< orgs.size() ; i++) + { + String orgId = orgs.get(i).getId()+""; + if (i == orgs.size() -1) + { + hospitalIds+=orgId; + } + else + { + hospitalIds+=orgId+","; + } + } + } + + String planTimeStart = ""; String planTimeEnd = ""; if (StringUtils.isNotEmpty(planTime)) @@ -651,7 +677,7 @@ public class SmsConfigFacade { } List> list = new ArrayList<>(); - SmsResult sms = MessageCenterService.querySmsList(hospitalId, phone, smsType, smsStatus, content, planTimeStart, planTimeEnd, actualTimeStart, actualTimeEnd,objType, page, limit); + SmsResult sms = MessageCenterService.querySmsList(hospitalIds, phone, smsType, smsStatus, content, planTimeStart, planTimeEnd, actualTimeStart, actualTimeEnd,objType, page, limit); if (sms != null && sms.getList() != null ) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index ce948df..bfc8807 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -109,7 +109,7 @@ public class BabyBookbuildingAddRequest { private String deliverOrg; //apgar评分 - private Map apgar; + private Map apgarScore; //是否畸形 0非畸形 1畸形 private Integer malformation; @@ -475,12 +475,12 @@ public class BabyBookbuildingAddRequest { this.vcCardNo = vcCardNo; } - public Map getApgar() { - return apgar; + public Map getApgarScore() { + return apgarScore; } - public void setApgar(Map apgar) { - this.apgar = apgar; + public void setApgarScore(Map apgarScore) { + this.apgarScore = apgarScore; } public String getMremark() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java index 8de57c1..51d1d66 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java @@ -92,7 +92,7 @@ public class BabyBuildResult { private Integer malformation; //apgar评分 - private Map apgar; + private Map apgarScore; //建档医生 private Map buildDoctor; @@ -487,11 +487,11 @@ public class BabyBuildResult { this.vcCardNo = vcCardNo; } - public Map getApgar() { - return apgar; + public Map getApgarScore() { + return apgarScore; } - public void setApgar(Map apgar) { - this.apgar = apgar; + public void setApgarScore(Map apgarScore) { + this.apgarScore = apgarScore; } }