jiangjiazhi / regional-platform

Download as
Browse Code »

Commit dece08c8a845e67bf93f228f1e86293c45173397

Authored by jiangjiazhi
2 parents 97defa2ce3 a79ac21bb7
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/StopPregModel.java View file @ dece08c
... ... @@ -35,6 +35,16 @@
35 35  
36 36 private String hospitalId;
37 37  
  38 + private String pid;
  39 +
  40 + public String getPid() {
  41 + return pid;
  42 + }
  43 +
  44 + public void setPid(String pid) {
  45 + this.pid = pid;
  46 + }
  47 +
38 48 public String getHospitalId() {
39 49 return hospitalId;
40 50 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java View file @ dece08c
... ... @@ -134,7 +134,7 @@
134 134 @RequestParam(required = true) String hid,
135 135 @RequestParam(required = true) String highConfig,
136 136 @RequestParam(required = true) Integer status) {
137   - return smsConfigFacade.addOrUpdateHospitalConfig(hospitalName,shortCode,provinceId,cityId,areaId,address,remark,
  137 + return smsConfigFacade.addOrUpdateHospitalConfig(hospitalName, shortCode, provinceId, cityId, areaId, address, remark,
138 138 hid, highConfig, status);
139 139 }
140 140  
... ... @@ -174,6 +174,22 @@
174 174 @RequestParam(required = false) Integer limit
175 175 ) {
176 176 return smsConfigFacade.queryConfigHospitals(hospitalName,provinceId, cityId, areaId, status,page,limit);
  177 + }
  178 +
  179 +
  180 +
  181 + @RequestMapping(value = "/querySmsList", method = RequestMethod.GET)
  182 + @ResponseBody
  183 + public BaseResponse querySmsList(@RequestParam(required = false) String hospitalId,
  184 + @RequestParam(required = false) String phone,
  185 + @RequestParam(required = false) Integer smsType,
  186 + @RequestParam(required = false) Integer smsStatus,
  187 + @RequestParam(required = false) String content,
  188 + @RequestParam(required = false) String planTime,
  189 + @RequestParam(required = false) String actualTime,
  190 + @RequestParam(required = false) Integer page,
  191 + @RequestParam(required = false) Integer limit) {
  192 + return smsConfigFacade.querySmsList(hospitalId, phone, smsType, smsStatus, content,planTime,actualTime, page, limit);
177 193 }
178 194 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java View file @ dece08c
... ... @@ -628,5 +628,10 @@
628 628 objectResponse.setErrormsg("成功");
629 629 return objectResponse;
630 630 }
  631 +
  632 + public BaseObjectResponse querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTime,String actualTime, Integer page, Integer limit)
  633 + {
  634 + return null;
  635 + }
631 636 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java View file @ dece08c
... ... @@ -182,7 +182,7 @@
182 182  
183 183 private StopPregModel getStopPregModel(StopPregRequest request) {
184 184 StopPregModel model = new StopPregModel();
185   -
  185 + model.setPid(request.getPid());
186 186 model.setYn(YnEnums.YES.getId());
187 187 model.setInPerson(request.getInPerson());
188 188 model.setRemark(request.getRemark());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java View file @ dece08c
... ... @@ -61,5 +61,21 @@
61 61 return false;
62 62 }
63 63  
  64 +
  65 + public static List<Map> querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTime,String actualTime, Integer page, Integer limit)
  66 + {
  67 +//// String result = HttpRequest.sendPost(CENTER_BASE_URL + "messages/{" + hid + "}", json, CENTER_TOKEN);
  68 +// String result = HttpRequest.sendGet("http://192.168.5.13:8080/v1/messages/" + hid, json, "YMer2016");
  69 +// if (StringUtils.isNotEmpty(result))
  70 +// {
  71 +// Map<String,String> map = JsonUtil.str2Obj(result, Map.class);
  72 +// if ("0".equals(map.get("errorcode")))
  73 +// {
  74 +// return true;
  75 +// }
  76 +// }
  77 +// return false;
  78 + return null;
  79 + }
64 80 }