jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c032c0112e08860e650e05c49351797f0f11902e

Authored by jiangjiazhi
2 parents 2828b9a259 fd235f5941
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-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ c032c01
... ... @@ -2096,17 +2096,18 @@
2096 2096 private MessageRequest getMessageRequest(String messageContent,String phone,Integer serviceObj,Integer smsType,String hospitalId,String tempId,String pid)
2097 2097 {
2098 2098 MessageRequest request = new MessageRequest();
2099   - //平台ID TODO
2100   - request.setTypeId(1);
  2099 + //平台ID
  2100 + request.setTypeId(ProjectTypeEnums.YNXT.getId());
2101 2101 request.setContent(messageContent);
2102 2102 //服务对象 1孕妇 2儿童 3产妇
2103 2103 request.setObjType(serviceObj);
2104 2104 request.setPhone(phone);
2105 2105 //计划发送时间
2106 2106 request.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
2107   - //短信商 TODO
2108   - request.setServiceType(1);
  2107 + //短信商
  2108 + request.setServiceType(SmsProviderEnums.ALDY.getId());
2109 2109 request.setSubTypeId(smsType);
  2110 + request.setStatus(SmsStatusEnums.WFS.getId());
2110 2111  
2111 2112 //医院ID ext1
2112 2113 //模板ID ext2;
2113 2114  
2114 2115  
... ... @@ -2126,18 +2127,15 @@
2126 2127 private void sendSms(MessageListRequest list)
2127 2128 {
2128 2129 if (list != null && CollectionUtils.isNotEmpty(list.getMessages()))
2129   - { //平台ID TODO
2130   - list.setTypeId(1);
  2130 + { //平台ID
  2131 + list.setTypeId(ProjectTypeEnums.YNXT.getId());
2131 2132 if (list != null && list.getMessages() != null)
2132 2133 {
2133 2134 List<MessageRequest> msgs = list.getMessages();
2134 2135 allMsgs.addAll(msgs);
2135   -// for (MessageRequest msg :msgs)
2136   -// {
2137   -// System.out.println("=======" + msg.getContent());
2138   -// }
  2136 +
2139 2137 }
2140   - //SaveMessageService.saveSmsCenter(list);
  2138 + SaveMessageService.saveSmsCenter(list);
2141 2139 }
2142 2140 }
2143 2141  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java View file @ c032c01
... ... @@ -132,7 +132,7 @@
132 132 @RequestParam(required = true) String address,
133 133 @RequestParam(required = false) String remark,
134 134 @RequestParam(required = true) String hid,
135   - @RequestParam(required = true) String highConfig,
  135 + @RequestParam(required = false) String highConfig,
136 136 @RequestParam(required = true) Integer status) {
137 137 return smsConfigFacade.addOrUpdateHospitalConfig(hospitalName, shortCode, provinceId, cityId, areaId, address, remark,
138 138 hid, highConfig, status);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java View file @ c032c01
... ... @@ -45,13 +45,13 @@
45 45  
46 46 /**
47 47 *查询终止妊娠记录
48   - * @param pid 孕妇建档Id
  48 + * @param id 孕妇建档Id
49 49 * @return
50 50 */
51   - @RequestMapping(method = RequestMethod.GET, value = "/queryStopPreg/{pid}")
  51 + @RequestMapping(method = RequestMethod.GET, value = "/queryStopPreg/{id}")
52 52 @ResponseBody
53   - public BaseResponse queryStopPreg(@PathVariable("pid")String pid) {
54   - return stopPregnancyFacade.queryStopPreg(pid);
  53 + public BaseResponse queryStopPreg(@PathVariable("id")String id) {
  54 + return stopPregnancyFacade.queryStopPreg(id);
55 55 }
56 56  
57 57  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ c032c01
... ... @@ -540,7 +540,7 @@
540 540 mr.setTypeId(ProjectTypeEnums.YNXT.getId());
541 541 mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
542 542 mr.setSubTypeId(SmsServiceEnums.FWKT.getId());
543   - mr.setStatus(0);
  543 + mr.setStatus(SmsStatusEnums.WFS.getId());
544 544  
545 545 mr.setExt1(babyModel.getHospitalId());
546 546 mr.setExt2(templateModel.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java View file @ c032c01
... ... @@ -196,15 +196,15 @@
196 196  
197 197 /**
198 198 * 查询终止妊娠
199   - * @param pid
  199 + * @param id
200 200 * @return
201 201 */
202   - public BaseResponse queryStopPreg(String pid) {
  202 + public BaseResponse queryStopPreg(String id) {
203 203  
204 204 Map map = new HashMap();
205 205 StopPregQuery query = new StopPregQuery();
206 206 query.setYn(YnEnums.YES.getId());
207   - query.setPatientId(pid);
  207 + query.setId(id);
208 208 StopPregResult result = null;
209 209 List<StopPregModel> stopPregs = stopPregnancyService.queryStopPreg(query);
210 210 if (CollectionUtils.isNotEmpty(stopPregs))
... ... @@ -227,8 +227,8 @@
227 227 List<Users> users = usersService.queryUsers2(usersQuery);
228 228 if (CollectionUtils.isNotEmpty(users))
229 229 {
230   - pmap.put("inPerson",inperson);
231   - pmap.put("personName", users.get(0) == null ? "" : users.get(0).getName());
  230 + pmap.put("id",inperson);
  231 + pmap.put("name", users.get(0) == null ? "" : users.get(0).getName());
232 232 }
233 233  
234 234 }
235 235  
... ... @@ -237,12 +237,12 @@
237 237  
238 238 //查询孕妇的基本信息
239 239 AntexListResult antexListResult = null;
240   - if(!StringUtils.isEmpty(pid))
  240 + if(!StringUtils.isEmpty(result.getPatientId()))
241 241 {
242 242 Patients patients = null;
243 243  
244 244 PatientsQuery patientsQuery = new PatientsQuery();
245   - patientsQuery.setId(pid);
  245 + patientsQuery.setId(result.getPatientId());
246 246 patientsQuery.setYn(YnEnums.YES.getId());
247 247  
248 248 List<Patients> listPatiens = patientsService.queryPatient(patientsQuery);