jiangjiazhi / regional-platform

Commit 05840fdde7fa684d7927ca1a60d2c5fc261bf5b8

Authored by zhangchao over 1 year ago

Exists in dev

#fix:新增大同服务到期公众号提醒

Showing 7 changed files with 89 additions and 3 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java
platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java

...	...	@@ -100,6 +100,25 @@
100	100
101	101	private Date docEndTime;//'医生结束时间';
102	102
	103	+ private String serEndStartTime;
	104	+ private String serEndCheckTime;
	105	+
	106	+ public String getSerEndStartTime() {
	107	+ return serEndStartTime;
	108	+ }
	109	+
	110	+ public void setSerEndStartTime(String serEndStartTime) {
	111	+ this.serEndStartTime = serEndStartTime;
	112	+ }
	113	+
	114	+ public String getSerEndCheckTime() {
	115	+ return serEndCheckTime;
	116	+ }
	117	+
	118	+ public void setSerEndCheckTime(String serEndCheckTime) {
	119	+ this.serEndCheckTime = serEndCheckTime;
	120	+ }
	121	+
103	122	public Integer getDevice() {
104	123	return device;
105	124	}

...	...	@@ -349,6 +349,14 @@
349	349	]]>
350	350	</if>
351	351
	352	+ <if test="serEndStartTime != null">
	353	+ AND
	354	+ <![CDATA[
	355	+ serEndTime>=#{serEndStartTime}
	356	+ and serEndTime<=#{serEndCheckTime}
	357	+ ]]>
	358	+ </if>
	359	+
352	360
353	361	<if test="docStartTime != null">
354	362	and docStartTime = #{docStartTime,jdbcType=TIMESTAMP}

...	...	@@ -28,7 +28,7 @@
28	28	YU_YUE_JIAN_DANG_TX("tx-UmDE3YMgYaAeFccXB7HITuG_tiP9LMdX2bvBpus","建档提醒"),//预约建档未审核提醒
29	29	// FU_WU_DING_GOU_TX("UEwcdz3lJL3NR38KRqN6yTO4nUvRgym5mlXl4jXQBik","服务订购提醒"),//服务订购提醒和收费成功后的高危提醒
30	30	// YI_SHENG_ZHI_DAO("UEwcdz3lJL3NR38KRqN6yTO4nUvRgym5mlXl4jXQBik","医生指导"),//指导
31		-
	31	+ FU_WU_DAO_QI_TX("YNlDxKnN_XKWZVIu0N5yOEtrAXJbFXl37KRHKx4BEyw","服务到期提醒"),
32	32	//YI_SHENG_ZHI_DAO("5yoQyJ92Ruip87JWQ1zdWO9JtllyyqE3jtHGHV7GyeI","医生指导"),//指导由于被举报被微信平台删除
33	33	//YI_SHENG_ZHI_DAO("OggqiSHitLkCgSLCaCH72reCZzaw5NyG8iO56InQiQg","医生指导"),//指导
34	34	// WEI_JI_ZHI_DAO("fNkkLSp_gS-YWvzji6gwgdTddl4XBlk8SNP7FRksrfk","危急值提醒");//危急值提醒

...	...	@@ -1629,6 +1629,62 @@
1629	1629	}
1630	1630	}
1631	1631
	1632	+ /**
	1633	+ * 大同服务到期提醒上午10点推送
	1634	+ */
	1635	+ public void serviceExpireSync() {
	1636	+ logger.info("serviceExpireSync startup...");
	1637	+ PatientServiceQuery query=new PatientServiceQuery();
	1638	+ final String hospitalId = "2100002419";
	1639	+ query.setHospitalId(hospitalId);
	1640	+ query.setPerType(1);
	1641	+ query.setSerType(1);
	1642	+ query.setSerStatus(1);
	1643	+ String date= DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(),1));
	1644	+ query.setSerEndStartTime(date+" 00:00:00");
	1645	+ query.setSerEndCheckTime(date+" 23:59:59");
	1646	+ final List<PatientService> serviceList= patientServiceService.queryPatientService(query);
	1647	+ if (CollectionUtils.isNotEmpty(serviceList)){
	1648	+ commonThreadPool.execute(
	1649	+ new Runnable() {
	1650	+ @Override public void run() {
	1651	+ List<MsgRequest> messages = new ArrayList<>();
	1652	+ for (PatientService patientService:serviceList){
	1653	+ Patients patient= patientsService.findOnePatientById(patientService.getParentid());
	1654	+ if (patient!=null){
	1655	+ MsgRequest mr = new MsgRequest();
	1656	+ mr.setPhone(patient.getPhone());
	1657	+ mr.setTypeId(ProjectTypeEnums.YNXT.getId());
	1658	+ mr.setStatus(SmsStatusEnums.WFS.getId());
	1659	+ mr.setHospitalId(hospitalId);
	1660	+ mr.setTempId(patient.getId());
	1661	+ mr.setPatientId(patient.getId());
	1662	+ mr.setSmsStatus(SmsStatusEnums.WFS.getId());
	1663	+ mr.setServiceType(1); //判断发送类型
	1664	+ mr.setFirst("您好，您购买的产科服务即将到期。");//
	1665	+ mr.setObjType(1);
	1666	+ mr.setSubTypeId(SmsServiceEnums.FWKT.getId());
	1667	+ mr.setKeyword1("产科在线咨询服务");//
	1668	+ //planTime 和 timeType为必填否则推送中心会推送异常
	1669	+ mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
	1670	+ mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
	1671	+ mr.setKeyword2(DateUtil.getyyyy_MM_dd(patientService.getSerEndTime())+"。为了避免服务中断给您带来不便，建议您尽快续费。");
	1672	+ //mr.setRemark(patient.getUsername());
	1673	+ mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));
	1674	+ mr.setWxTempId("YNlDxKnN_XKWZVIu0N5yOEtrAXJbFXl37KRHKx4BEyw");
	1675	+ messages.add(mr);
	1676	+ }
	1677	+ }
	1678	+ if (CollectionUtils.isNotEmpty(messages)){
	1679	+ //smsConfigFacade.saveMsg(messages, hospitalId);
	1680	+ }
	1681	+ }
	1682	+ });
	1683	+
	1684	+ }
	1685	+ logger.info("serviceExpireSync end...");
	1686	+
	1687	+ }
1632	1688
1633	1689	/**
1634	1690	* 大同服务内容提醒上午9点推送

...	...	@@ -274,7 +274,7 @@
274	274	patientsQuery.setType(type);
275	275	if ("2100002419".equals(hospitalId)){
276	276	patientsQuery.setHospitalId(hospitalId);
277		- if (type!=3){
	277	+ if (type!=null&&type!=3){
278	278	patientsQuery.setDtFm(true);
279	279	}
280	280

...	...	@@ -398,6 +398,9 @@
398	398	if ("2".equals(riskPatientsQueryRequest.getType())) {
399	399	//1孕妇
400	400	patientsQuery.setType(1);
	401	+ if ("2100002419".equals(hospitalId)){
	402	+ patientsQuery.setDtFm(true);
	403	+ }
401	404	} else if ("3".equals(riskPatientsQueryRequest.getType())) {
402	405	//3产妇
403	406	patientsQuery.setType(3);

...	...	@@ -60,7 +60,7 @@
60	60	//urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院");
61	61	//urls.put("area-weihai-api.healthbaby.com.cn:12356","威海市妇幼");
62	62	//urls.put("area-chengde-api.healthbaby.com.cn:12356","承德");
63		- urls.put("area-nanhe-api.healthbaby.com.cn:12356","南和");
	63	+ urls.put("area-nanhe-api.healthbaby.com.cn:1236","南和");
64	64	urls.put("area-dt-api.healthbaby.com.cn:12356","大同");
65	65	//urls.put("area-lingcheng-api.healthbaby.com.cn:12356","陵城");
66	66	}