fangcheng / regional-platform

Download as
Browse Code ยป

Commit 8418808406cde76a207e580c1d92a2812c7e31c3

Authored by liquanyu
1 parent 9612a50ddf
Exists in master and in 1 other branch nobuildprocess

code update

Showing 4 changed files with 8 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java View file @ 8418808
... ... @@ -184,12 +184,13 @@
184 184 @RequestParam(required = false) String phone,
185 185 @RequestParam(required = false) Integer smsType,
186 186 @RequestParam(required = false) Integer smsStatus,
  187 + @RequestParam(required = false) Integer objType,
187 188 @RequestParam(required = false) String content,
188 189 @RequestParam(required = false) String planTime,
189 190 @RequestParam(required = false) String actualTime,
190 191 @RequestParam(required = false) Integer page,
191 192 @RequestParam(required = false) Integer limit) {
192   - return smsConfigFacade.querySmsList(hospitalId, phone, smsType, smsStatus, content,planTime,actualTime, page, limit);
  193 + return smsConfigFacade.querySmsList(hospitalId, phone, smsType, smsStatus, content,planTime,actualTime,objType, page, limit);
193 194 }
194 195 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 8418808
... ... @@ -1162,7 +1162,7 @@
1162 1162 Patients patients = patientsService.findOnePatientByCardNo(puerperaQuery);
1163 1163 map.put("patients", patients);
1164 1164 map.put("records",results);
1165   - map.put("buildInfo",buildInfo);
  1165 + map.put("buildInfo",getBabyBuildResult(buildInfo));
1166 1166 map.put("isCurrentHospBuild",isCurrentHosp);
1167 1167  
1168 1168 BaseObjectResponse objectResponse = new BaseObjectResponse();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java View file @ 8418808
... ... @@ -631,7 +631,7 @@
631 631 return objectResponse;
632 632 }
633 633  
634   - public BaseListResponse querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTime,String actualTime, Integer page, Integer limit)
  634 + public BaseListResponse querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTime,String actualTime,Integer objType, Integer page, Integer limit)
635 635 {
636 636 String planTimeStart = "";
637 637 String planTimeEnd = "";
... ... @@ -651,7 +651,7 @@
651 651 }
652 652 List<Map<String,String>> list = new ArrayList<>();
653 653  
654   - SmsResult sms = MessageCenterService.querySmsList(hospitalId, phone, smsType, smsStatus, content, planTimeStart, planTimeEnd, actualTimeStart, actualTimeEnd, page, limit);
  654 + SmsResult sms = MessageCenterService.querySmsList(hospitalId, phone, smsType, smsStatus, content, planTimeStart, planTimeEnd, actualTimeStart, actualTimeEnd,objType, page, limit);
655 655  
656 656 if (sms != null && sms.getList() != null )
657 657 {
... ... @@ -676,6 +676,7 @@
676 676 map.put("smsType",SmsServiceEnums.getSmsServiceById(obj.getSubTypeId()));
677 677 map.put("phone",obj.getPhone());
678 678 map.put("content",obj.getContent());
  679 + map.put("objType",ServiceObjEnums.getServiceObjById(obj.getObjType()));
679 680  
680 681 if (obj.getPlanTime() != null && obj.getPlanTime() > 0)
681 682 {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java View file @ 8418808
... ... @@ -68,11 +68,11 @@
68 68 }
69 69  
70 70  
71   - 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)
  71 + 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)
72 72 {
73 73 String param = "typeId=4&ext1="+StringUtils.emptyStr(hospitalId)+"&phone="+StringUtils.emptyStr(phone)+"&subTypeId="+StringUtils.emptyInt(smsType)+"&content="+StringUtils.emptyStr(content)+
74 74 "&planTimeStart="+planTimeStart+"&planTimeEnd="+planTimeEnd+"&actualTimeStart="+actualTimeStart+
75   - "&actualTimeEnd="+actualTimeEnd+"&status="+StringUtils.emptyInt(smsStatus)+"&page="+page+"&limit="+limit;
  75 + "&actualTimeEnd="+actualTimeEnd+"&status="+StringUtils.emptyInt(smsStatus)+"&objType="+StringUtils.emptyInt(objType)+"&page="+page+"&limit="+limit;
76 76 String result = HttpRequest.sendGet(CENTER_BASE_URL+"messages", param, CENTER_TOKEN);
77 77 // SmsResult map = new SmsResult();
78 78 // String result = HttpRequest.sendGet("http://192.168.5.6:8080/v1/messages", param, "YMer2016");