jiangjiazhi / regional-platform

Commit ee67124b4865b76ceb55c22a2706181de20503d2

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

update code

Showing 8 changed files with 76 additions and 31 deletions

platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/service/IBaseService.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java

...	...	@@ -23,6 +23,11 @@
23	23	@Autowired
24	24	private IMsgGenerateService msgGenerateService;
25	25
	26	+ /**
	27	+ * 生成孕妇ams消息
	28	+ * @param hospitalId
	29	+ * @return
	30	+ */
26	31	@RequestMapping(method = RequestMethod.GET, value = "/generatePatAmsMsg")
27	32	@ResponseBody
28	33	public String generatePatAmsMsg(@RequestParam(required = false) String hospitalId)
...	...	@@ -33,6 +38,37 @@
33	38	return "";
34	39	}
35	40
	41	+
	42	+ /**
	43	+ * 生成儿童ams消息
	44	+ * @param hospitalId
	45	+ * @return
	46	+ */
	47	+ @RequestMapping(method = RequestMethod.GET, value = "/generateBabyAmsMsg")
	48	+ @ResponseBody
	49	+ public String generateBabyAmsMsg(@RequestParam(required = false) String hospitalId)
	50	+ {
	51	+
	52	+ logger.info("The request hospital id is {} ", hospitalId);
	53	+ msgGenerateService.generateBabyAmsMsg(hospitalId);
	54	+ return "";
	55	+ }
	56	+
	57	+
	58	+ /**
	59	+ * 生成产妇ams消息
	60	+ * @param hospitalId
	61	+ * @return
	62	+ */
	63	+ @RequestMapping(method = RequestMethod.GET, value = "/generateChanAmsMsg")
	64	+ @ResponseBody
	65	+ public String generateChanAmsMsg(@RequestParam(required = false) String hospitalId)
	66	+ {
	67	+
	68	+ logger.info("The request hospital id is {} ", hospitalId);
	69	+ msgGenerateService.generateChanAmsMsg(hospitalId);
	70	+ return "";
	71	+ }
36	72
37	73	/**
38	74	* 生成模板推送消息

...	...	@@ -27,7 +27,7 @@
27	27
28	28	public boolean queryYunIsOrder(Integer sendTimeType,String tempHid,String pid,Date lastLmess,Integer start);
29	29
30		- public String getSmsPrefix(SmsConfigModel config,String doctorId);
	30	+ public String getSmsPrefix(SmsConfigModel config,String doctorId,int objType);
31	31
32	32	public Set<String> getYuYuePatient(Integer sendTimeType,String tempHid);
33	33	}

...	...	@@ -2,6 +2,7 @@
2	2
3	3	import com.lyms.platform.biz.service.*;
4	4	import com.lyms.platform.common.enums.HospitalStatusEnums;
	5	+import com.lyms.platform.common.enums.ServiceObjEnums;
5	6	import com.lyms.platform.common.enums.YnEnums;
6	7	import com.lyms.platform.common.utils.JsonUtil;
7	8	import com.lyms.platform.common.utils.StringUtils;
...	...	@@ -234,7 +235,7 @@
234	235	* 然后取对应科室前缀如果为空就取医院前缀
235	236	* @return
236	237	*/
237		- public String getSmsPrefix(SmsConfigModel config,String doctorId)
	238	+ public String getSmsPrefix(SmsConfigModel config,String doctorId,int objType)
238	239	{
239	240	String prefix = "";
240	241	//是否收费，孕妇，儿童，产妇 {"pregnant":"true","baby":"false","puerperant":"true"}
241	242
242	243
243	244
...	...	@@ -245,14 +246,35 @@
245	246	Map<String,String> chargeMap = JsonUtil.getMap(isCharge);
246	247	if (chargeMap != null && chargeMap.size() > 0)
247	248	{
248		- String pregnant = chargeMap.get("pregnant");
249		- if (StringUtils.isNotEmpty(pregnant) && "true".equals(pregnant))
	249	+ //孕妇
	250	+ if (objType == ServiceObjEnums.YUNOBJ.getId())
250	251	{
251		- prefix = getPrefix(config,doctorId);
	252	+ String pregnant = chargeMap.get("pregnant");
	253	+ if (StringUtils.isNotEmpty(pregnant) && "true".equals(pregnant))
	254	+ {
	255	+ prefix = getPrefix(config,doctorId);
	256	+ }
252	257	}
	258	+ //儿童
	259	+ else if (objType == ServiceObjEnums.BABYOBJ.getId())
	260	+ {
	261	+ String baby = chargeMap.get("baby");
	262	+ if (StringUtils.isNotEmpty(baby) && "true".equals(baby))
	263	+ {
	264	+ prefix = getPrefix(config,doctorId);
	265	+ }
	266	+ }
	267	+ //产妇
	268	+ else if (objType == ServiceObjEnums.CHANOBJ.getId())
	269	+ {
	270	+ String puerperant = chargeMap.get("puerperant");
	271	+ if (StringUtils.isNotEmpty(puerperant) && "true".equals(puerperant))
	272	+ {
	273	+ prefix = getPrefix(config,doctorId);
	274	+ }
	275	+ }
253	276	}
254	277	}
255		-
256	278	return prefix;
257	279	}
258	280

...	...	@@ -110,14 +110,7 @@
110	110	continue;
111	111	}
112	112
113		- String messagePrefix = config.getHospitalPrefix();
114		- //前缀类型 0医院前缀 1科室前缀
115		- if (config.getPrefixType() == 1)
116		- {
117		- String res = baseService.getDeptPrefix(baby.getBuildDoctor(), config.getDeptPrefix());
118		- messagePrefix = res == "" ? messagePrefix : res;
119		- }
120		-
	113	+ String messagePrefix = baseService.getSmsPrefix(config, baby.getBuildDoctor(),ServiceObjEnums.BABYOBJ.getId());
121	114
122	115	int weeks = DateUtils.daysBetween(baby.getBirth(),new Date()) / 7;
123	116	String weekAge = String.valueOf(weeks);

...	...	@@ -115,7 +115,7 @@
115	115	continue;
116	116	}
117	117
118		- String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor());
	118	+ String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(),ServiceObjEnums.CHANOBJ.getId());
119	119
120	120	//计算产后多少周按分娩日期计算
121	121	int weeks = DateUtils.daysBetween(pat.getFmDate(),new Date()) / 7;

...	...	@@ -150,8 +150,6 @@
150	150	}
151	151	});
152	152	}
153		-
154		-
155	153	}
156	154	catch (Exception e)
157	155	{
...	...	@@ -218,7 +216,7 @@
218	216	for (BabyModel model : babyModels)
219	217	{
220	218	//短信前缀
221		- String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor());
	219	+ String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor(),ServiceObjEnums.BABYOBJ.getId());
222	220	String messageContent = "【"+messagePrefix+"】"+template.getContent();
223	221	messageContent = HelperUtils.replaceEL(model.getName(), yuYueDate, messageContent);
224	222
...	...	@@ -289,7 +287,7 @@
289	287
290	288
291	289	//短信前缀
292		- String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor());
	290	+ String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor(),ServiceObjEnums.BABYOBJ.getId());
293	291	String messageContent = "【"+messagePrefix+"】"+template.getContent();
294	292	messageContent = HelperUtils.replaceName(model.getName(), messageContent);
295	293
...	...	@@ -343,7 +341,7 @@
343	341	}
344	342
345	343	//短信前缀
346		- String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor());
	344	+ String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor(),ServiceObjEnums.BABYOBJ.getId());
347	345	String messageContent = "【"+messagePrefix+"】"+template.getContent();
348	346	messageContent = HelperUtils.replaceName(model.getName(), messageContent);
349	347	String itemName = "儿童保健";
...	...	@@ -455,7 +453,7 @@
455	453	for (Patients pat : patients)
456	454	{
457	455	//短信前缀
458		- String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor());
	456	+ String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(),ServiceObjEnums.YUNOBJ.getId());
459	457	String messageContent = "【"+messagePrefix+"】"+template.getContent();
460	458	messageContent = HelperUtils.replaceEL(pat.getUsername(), yuYueDate, messageContent);
461	459
...	...	@@ -518,7 +516,7 @@
518	516	}
519	517
520	518	//短信前缀
521		- String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor());
	519	+ String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(), ServiceObjEnums.YUNOBJ.getId());
522	520	String messageContent = "【"+messagePrefix+"】"+template.getContent();
523	521
524	522	String checkWeekName = HelperUtils.getCheckTimeStr(start,end);
...	...	@@ -608,7 +606,7 @@
608	606	for (Patients pat : patients)
609	607	{
610	608	//短信前缀
611		- String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor());
	609	+ String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(),ServiceObjEnums.CHANOBJ.getId());
612	610	String messageContent = "【"+messagePrefix+"】"+template.getContent();
613	611	String title = "产后复查";
614	612	messageContent = HelperUtils.replaceEL(pat.getUsername(), actualSendDate, messageContent);
...	...	@@ -660,7 +658,7 @@
660	658	continue;
661	659	}
662	660	//短信前缀
663		- String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor());
	661	+ String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(),ServiceObjEnums.CHANOBJ.getId());
664	662	String messageContent = "【"+messagePrefix+"】"+template.getContent();
665	663	messageContent = HelperUtils.replaceName(pat.getUsername(), messageContent);
666	664

...	...	@@ -138,13 +138,8 @@
138	138	continue;
139	139	}
140	140
141		- String messagePrefix = config.getHospitalPrefix();
142		- //前缀类型 0医院前缀 1科室前缀
143		- if (config.getPrefixType() == 1)
144		- {
145		- String res = baseService.getDeptPrefix(pat.getBookbuildingDoctor(), config.getDeptPrefix());
146		- messagePrefix = res == "" ? messagePrefix : res;
147		- }
	141	+ //消息前缀
	142	+ String messagePrefix = baseService.getSmsPrefix(config,pat.getBookbuildingDoctor(),ServiceObjEnums.YUNOBJ.getId());
148	143
149	144	int weekNum = HelperUtils.getWeekNum(guideTimes,week);
150	145

...	...	@@ -52,6 +52,7 @@
52	52	urls.put("area-nc-api.healthbaby.com.cn:12356","南充");
53	53	urls.put("area-laoling-api.healthbaby.com.cn:12356","乐陵");
54	54	urls.put("rp-hbnq-api.healthbaby.com.cn:18019","内丘");
	55	+ urls.put("area-chengde-api.healthbaby.com.cn:12356","承德");
55	56	}
56	57
57	58	@Autowired