diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java index dcd1e37..423f99a 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java @@ -35,7 +35,7 @@ public enum SmsServiceEnums { QT(21,"其他",0,""), JRWH(22,"节日问候",21,"0,1,2,3"), YQTX(23,"疫情提醒",21,"0,1,2,3"), - EBYMTX(24,"儿保疫苗提醒",14,"2"); + EBYMTX(24,"疫苗接种提醒",14,"2"); private SmsServiceEnums(int id,String name,int pid,String serviceObj){ this.id = id; diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java index c36c50b..bc8e76b 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java @@ -13,6 +13,7 @@ public enum WxTempleteIdEnums { CHAN_JIAN_TI_XING("EngJ9RKaHaPEEc2GapV6dJO-uu8rkqitEQd21yc4EPY","产检提醒"), //产检预约提醒 ER_TONG_TI_XING("9BUY6THL261MmbVRb9iPZANQwJ5yKNzkE1VGCLPuI94","儿童月龄提醒"), //儿保预约提醒 + ER_TONG_YI_MIAO_TIXING("IDcR8sCa12kNj_Bn3LMcx9vk_dUMlLClPdNFOUm9VRtqE","疫苗接种提醒"), //疫苗接种提醒 CHAN_HOU_FU_CHA("jEbeeBKyjcquhFWUUndnRddLqLbK8-QF6yA98cYW_E8","产后复查"),//产后预约和产后复查 GAO_WEI_ZHI_DAO("n6fSC1wYc3jOfGmuI1Vtbut6TlaBPlt5482SqJ8CE4o","高危提醒"),//孕妇高危 diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java index c620f9b..cf9190c 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java @@ -372,5 +372,21 @@ public class HelperUtils { } - + /** + * #疫苗名称# + * 获取疫苗中的名称 + * @param content + * @return + */ + public static String getVaccineName(String content) { + if (StringUtils.isNotEmpty(content)) + { +// String[] arras = content.f +// if (arras != null) +// { +// +// } + } + return null; + } } 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 67dbf58..fb4ae5f 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 @@ -396,7 +396,7 @@ public class TempleteMsgGenerateWorker implements Runnable { } } } - //儿童疫苗提醒 + //疫苗接种提醒 else if (smsType == SmsServiceEnums.EBYMTX.getId()) { //发送频次 @@ -452,13 +452,14 @@ public class TempleteMsgGenerateWorker implements Runnable { String messageContent = "【"+messagePrefix+"】"+template.getContent(); messageContent = HelperUtils.replaceName(model.getName(), messageContent); - String itemName = "儿童保健"; - String nextCheckTime = HelperUtils.getKeyword(start, end, "天"); + String vaccineTime = HelperUtils.getKeyword(start, end, "天"); + String vaccineName = HelperUtils.getVaccineName(template.getContent()); + String vaccinePerson = model.getName(); MsgRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(), ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), - model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, "", - WxTempleteIdEnums.ER_TONG_TI_XING.getId(),service); + model.getHospitalId(), template.getId(), model.getId(), vaccineName, vaccinePerson, vaccineTime, + WxTempleteIdEnums.ER_TONG_YI_MIAO_TIXING.getId(),service); messages.add(request); @@ -508,13 +509,13 @@ public class TempleteMsgGenerateWorker implements Runnable { String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor(),ServiceObjEnums.BABYOBJ.getId()); String messageContent = "【"+messagePrefix+"】"+template.getContent(); messageContent = HelperUtils.replaceName(model.getName(), messageContent); - String itemName = "儿童保健"; + String itemName = "疫苗接种提醒"; String nextCheckTime = HelperUtils.getKeyword(start, end, "月龄"); MsgRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(), ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, "", - WxTempleteIdEnums.ER_TONG_TI_XING.getId(),service); + WxTempleteIdEnums.ER_TONG_YI_MIAO_TIXING.getId(),service); messages.add(request); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java index 622b380..715e4a9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java @@ -60,15 +60,16 @@ public class PregnantBuildController extends BaseController{ /** * 查询孕妇是否有建档记录 有就返回patientid - * + *valueType 1体重身高 2、血压和脉搏 * @return */ @RequestMapping(value = "/getPatientBuildId", method = RequestMethod.GET) @ResponseBody public String getPatientBuildId(@RequestParam(required = true) String certType, @RequestParam(required = true) String certNo, - @RequestParam(required = true) String hospitalId) { - return bookbuildingFacade.getPatientBuildId(certType,certNo,hospitalId); + @RequestParam(required = true) String hospitalId, + @RequestParam(required = true) Integer valueType) { + return bookbuildingFacade.getPatientBuildId(certType,certNo,hospitalId,valueType); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 9c88d08..12b5733 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -34,6 +34,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletResponse; @@ -134,6 +137,9 @@ public class BookbuildingFacade { @Autowired private PatientServiceFacade patientServiceFacade; + @Autowired + private MongoTemplate mongoTemplate; + /** * 根据患者的建档ID，查询还未使用的免费产检查券 * @@ -1865,7 +1871,7 @@ public class BookbuildingFacade { } - public String getPatientBuildId(String certType, String certNo,String hospitalId) { + public String getPatientBuildId(String certType, String certNo,String hospitalId,Integer valueType) { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setCardNo(certNo); patientsQuery.setPcerteTypeId(certType); @@ -1876,6 +1882,15 @@ public class BookbuildingFacade { if (CollectionUtils.isNotEmpty(patients)) { patientId = patients.get(0).getId(); + if (valueType == 1) + { + PatientWeight pw = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients.get(0).getPid())), PatientWeight.class); + if (pw == null) + { + patientId = ""; + } + } + } return patientId; }