diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java index ffbd514..7fc8c74 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java @@ -23,6 +23,11 @@ public class MsgGenerateController extends BaseController { @Autowired private IMsgGenerateService msgGenerateService; + /** + * 生成孕妇ams消息 + * @param hospitalId + * @return + */ @RequestMapping(method = RequestMethod.GET, value = "/generatePatAmsMsg") @ResponseBody public String generatePatAmsMsg(@RequestParam(required = false) String hospitalId) @@ -35,6 +40,37 @@ public class MsgGenerateController extends BaseController { /** + * 生成儿童ams消息 + * @param hospitalId + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/generateBabyAmsMsg") + @ResponseBody + public String generateBabyAmsMsg(@RequestParam(required = false) String hospitalId) + { + + logger.info("The request hospital id is {} ", hospitalId); + msgGenerateService.generateBabyAmsMsg(hospitalId); + return ""; + } + + + /** + * 生成产妇ams消息 + * @param hospitalId + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/generateChanAmsMsg") + @ResponseBody + public String generateChanAmsMsg(@RequestParam(required = false) String hospitalId) + { + + logger.info("The request hospital id is {} ", hospitalId); + msgGenerateService.generateChanAmsMsg(hospitalId); + return ""; + } + + /** * 生成模板推送消息 * @param hospitalId * @return diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/IBaseService.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/IBaseService.java index 6e4914b..ffa5172 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/IBaseService.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/IBaseService.java @@ -27,7 +27,7 @@ public interface IBaseService { public boolean queryYunIsOrder(Integer sendTimeType,String tempHid,String pid,Date lastLmess,Integer start); - public String getSmsPrefix(SmsConfigModel config,String doctorId); + public String getSmsPrefix(SmsConfigModel config,String doctorId,int objType); public Set getYuYuePatient(Integer sendTimeType,String tempHid); } diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java index fed803a..cf6d9db 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java @@ -2,6 +2,7 @@ package com.lyms.platform.msg.service.impl; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.enums.HospitalStatusEnums; +import com.lyms.platform.common.enums.ServiceObjEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; @@ -234,7 +235,7 @@ public class BaseServiceImpl implements IBaseService { * 然后取对应科室前缀 如果为空就取医院前缀 * @return */ - public String getSmsPrefix(SmsConfigModel config,String doctorId) + public String getSmsPrefix(SmsConfigModel config,String doctorId,int objType) { String prefix = ""; //是否收费，孕妇，儿童，产妇 {"pregnant":"true","baby":"false","puerperant":"true"} @@ -245,14 +246,35 @@ public class BaseServiceImpl implements IBaseService { Map chargeMap = JsonUtil.getMap(isCharge); if (chargeMap != null && chargeMap.size() > 0) { - String pregnant = chargeMap.get("pregnant"); - if (StringUtils.isNotEmpty(pregnant) && "true".equals(pregnant)) + //孕妇 + if (objType == ServiceObjEnums.YUNOBJ.getId()) { - prefix = getPrefix(config,doctorId); + String pregnant = chargeMap.get("pregnant"); + if (StringUtils.isNotEmpty(pregnant) && "true".equals(pregnant)) + { + prefix = getPrefix(config,doctorId); + } + } + //儿童 + else if (objType == ServiceObjEnums.BABYOBJ.getId()) + { + String baby = chargeMap.get("baby"); + if (StringUtils.isNotEmpty(baby) && "true".equals(baby)) + { + prefix = getPrefix(config,doctorId); + } + } + //产妇 + else if (objType == ServiceObjEnums.CHANOBJ.getId()) + { + String puerperant = chargeMap.get("puerperant"); + if (StringUtils.isNotEmpty(puerperant) && "true".equals(puerperant)) + { + prefix = getPrefix(config,doctorId); + } } } } - return prefix; } diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java index 03f5199..ff4d7cf 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java @@ -110,14 +110,7 @@ public class BabyAmsMsgGenerateWorker implements Runnable { continue; } - String messagePrefix = config.getHospitalPrefix(); - //前缀类型 0医院前缀 1科室前缀 - if (config.getPrefixType() == 1) - { - String res = baseService.getDeptPrefix(baby.getBuildDoctor(), config.getDeptPrefix()); - messagePrefix = res == "" ? messagePrefix : res; - } - + String messagePrefix = baseService.getSmsPrefix(config, baby.getBuildDoctor(),ServiceObjEnums.BABYOBJ.getId()); int weeks = DateUtils.daysBetween(baby.getBirth(),new Date()) / 7; String weekAge = String.valueOf(weeks); diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java index aa43f7d..6fea881 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java @@ -115,7 +115,7 @@ public class ChanAmsMsgGenerateWorker implements Runnable { continue; } - String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor()); + String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(),ServiceObjEnums.CHANOBJ.getId()); //计算产后多少周 按分娩日期计算 int weeks = DateUtils.daysBetween(pat.getFmDate(),new Date()) / 7; diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java index c203676..48a9892 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java @@ -150,8 +150,6 @@ public class TempleteMsgGenerateWorker implements Runnable { } }); } - - } catch (Exception e) { @@ -218,7 +216,7 @@ public class TempleteMsgGenerateWorker implements Runnable { for (BabyModel model : babyModels) { //短信前缀 - String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor()); + String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor(),ServiceObjEnums.BABYOBJ.getId()); String messageContent = "【"+messagePrefix+"】"+template.getContent(); messageContent = HelperUtils.replaceEL(model.getName(), yuYueDate, messageContent); @@ -289,7 +287,7 @@ public class TempleteMsgGenerateWorker implements Runnable { //短信前缀 - String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor()); + String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor(),ServiceObjEnums.BABYOBJ.getId()); String messageContent = "【"+messagePrefix+"】"+template.getContent(); messageContent = HelperUtils.replaceName(model.getName(), messageContent); @@ -343,7 +341,7 @@ public class TempleteMsgGenerateWorker implements Runnable { } //短信前缀 - String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor()); + String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor(),ServiceObjEnums.BABYOBJ.getId()); String messageContent = "【"+messagePrefix+"】"+template.getContent(); messageContent = HelperUtils.replaceName(model.getName(), messageContent); String itemName = "儿童保健"; @@ -455,7 +453,7 @@ public class TempleteMsgGenerateWorker implements Runnable { for (Patients pat : patients) { //短信前缀 - String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor()); + String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(),ServiceObjEnums.YUNOBJ.getId()); String messageContent = "【"+messagePrefix+"】"+template.getContent(); messageContent = HelperUtils.replaceEL(pat.getUsername(), yuYueDate, messageContent); @@ -518,7 +516,7 @@ public class TempleteMsgGenerateWorker implements Runnable { } //短信前缀 - String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor()); + String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(), ServiceObjEnums.YUNOBJ.getId()); String messageContent = "【"+messagePrefix+"】"+template.getContent(); String checkWeekName = HelperUtils.getCheckTimeStr(start,end); @@ -608,7 +606,7 @@ public class TempleteMsgGenerateWorker implements Runnable { for (Patients pat : patients) { //短信前缀 - String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor()); + String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(),ServiceObjEnums.CHANOBJ.getId()); String messageContent = "【"+messagePrefix+"】"+template.getContent(); String title = "产后复查"; messageContent = HelperUtils.replaceEL(pat.getUsername(), actualSendDate, messageContent); @@ -660,7 +658,7 @@ public class TempleteMsgGenerateWorker implements Runnable { continue; } //短信前缀 - String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor()); + String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(),ServiceObjEnums.CHANOBJ.getId()); String messageContent = "【"+messagePrefix+"】"+template.getContent(); messageContent = HelperUtils.replaceName(pat.getUsername(), messageContent); diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java index edcf229..4ffb4ba 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java @@ -138,13 +138,8 @@ public class YunAmsMsgGenerateWorker implements Runnable { continue; } - String messagePrefix = config.getHospitalPrefix(); - //前缀类型 0医院前缀 1科室前缀 - if (config.getPrefixType() == 1) - { - String res = baseService.getDeptPrefix(pat.getBookbuildingDoctor(), config.getDeptPrefix()); - messagePrefix = res == "" ? messagePrefix : res; - } + //消息前缀 + String messagePrefix = baseService.getSmsPrefix(config,pat.getBookbuildingDoctor(),ServiceObjEnums.YUNOBJ.getId()); int weekNum = HelperUtils.getWeekNum(guideTimes,week); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index 2e9e5ed..849ee54 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -52,6 +52,7 @@ public class SyncDataTaskService { urls.put("area-nc-api.healthbaby.com.cn:12356","南充"); urls.put("area-laoling-api.healthbaby.com.cn:12356","乐陵"); urls.put("rp-hbnq-api.healthbaby.com.cn:18019","内丘"); + urls.put("area-chengde-api.healthbaby.com.cn:12356","承德"); } @Autowired