jiangjiazhi / regional-platform

Commit ca47bdd127d10020ee2333800d7e19d9ff6afb1c

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

update code

Showing 6 changed files with 47 additions and 13 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java
platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java

...	...	@@ -35,7 +35,7 @@
35	35	QT(21,"其他",0,""),
36	36	JRWH(22,"节日问候",21,"0,1,2,3"),
37	37	YQTX(23,"疫情提醒",21,"0,1,2,3"),
38		- EBYMTX(24,"儿保疫苗提醒",14,"2");
	38	+ EBYMTX(24,"疫苗接种提醒",14,"2");
39	39
40	40	private SmsServiceEnums(int id,String name,int pid,String serviceObj){
41	41	this.id = id;

...	...	@@ -13,6 +13,7 @@
13	13
14	14	CHAN_JIAN_TI_XING("EngJ9RKaHaPEEc2GapV6dJO-uu8rkqitEQd21yc4EPY","产检提醒"), //产检预约提醒
15	15	ER_TONG_TI_XING("9BUY6THL261MmbVRb9iPZANQwJ5yKNzkE1VGCLPuI94","儿童月龄提醒"), //儿保预约提醒
	16	+ ER_TONG_YI_MIAO_TIXING("IDcR8sCa12kNj_Bn3LMcx9vk_dUMlLClPdNFOUm9VRtqE","疫苗接种提醒"), //疫苗接种提醒
16	17	CHAN_HOU_FU_CHA("jEbeeBKyjcquhFWUUndnRddLqLbK8-QF6yA98cYW_E8","产后复查"),//产后预约和产后复查
17	18
18	19	GAO_WEI_ZHI_DAO("n6fSC1wYc3jOfGmuI1Vtbut6TlaBPlt5482SqJ8CE4o","高危提醒"),//孕妇高危

...	...	@@ -372,6 +372,22 @@
372	372	}
373	373
374	374
375		-
	375	+ /**
	376	+ * #疫苗名称#
	377	+ * 获取疫苗中的名称
	378	+ * @param content
	379	+ * @return
	380	+ */
	381	+ public static String getVaccineName(String content) {
	382	+ if (StringUtils.isNotEmpty(content))
	383	+ {
	384	+// String[] arras = content.f
	385	+// if (arras != null)
	386	+// {
	387	+//
	388	+// }
	389	+ }
	390	+ return null;
	391	+ }
376	392	}

...	...	@@ -396,7 +396,7 @@
396	396	}
397	397	}
398	398	}
399		- //儿童疫苗提醒
	399	+ //疫苗接种提醒
400	400	else if (smsType == SmsServiceEnums.EBYMTX.getId())
401	401	{
402	402	//发送频次
403	403
...	...	@@ -452,13 +452,14 @@
452	452	String messageContent = "【"+messagePrefix+"】"+template.getContent();
453	453	messageContent = HelperUtils.replaceName(model.getName(), messageContent);
454	454
455		- String itemName = "儿童保健";
456		- String nextCheckTime = HelperUtils.getKeyword(start, end, "天");
	455	+ String vaccineTime = HelperUtils.getKeyword(start, end, "天");
	456	+ String vaccineName = HelperUtils.getVaccineName(template.getContent());
	457	+ String vaccinePerson = model.getName();
457	458
458	459	MsgRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(),
459	460	ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
460		- model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, "",
461		- WxTempleteIdEnums.ER_TONG_TI_XING.getId(),service);
	461	+ model.getHospitalId(), template.getId(), model.getId(), vaccineName, vaccinePerson, vaccineTime,
	462	+ WxTempleteIdEnums.ER_TONG_YI_MIAO_TIXING.getId(),service);
462	463
463	464	messages.add(request);
464	465
465	466
...	...	@@ -508,13 +509,13 @@
508	509	String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor(),ServiceObjEnums.BABYOBJ.getId());
509	510	String messageContent = "【"+messagePrefix+"】"+template.getContent();
510	511	messageContent = HelperUtils.replaceName(model.getName(), messageContent);
511		- String itemName = "儿童保健";
	512	+ String itemName = "疫苗接种提醒";
512	513	String nextCheckTime = HelperUtils.getKeyword(start, end, "月龄");
513	514
514	515	MsgRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(),
515	516	ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
516	517	model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, "",
517		- WxTempleteIdEnums.ER_TONG_TI_XING.getId(),service);
	518	+ WxTempleteIdEnums.ER_TONG_YI_MIAO_TIXING.getId(),service);
518	519	messages.add(request);
519	520
520	521	}

...	...	@@ -60,15 +60,16 @@
60	60
61	61	/**
62	62	* 查询孕妇是否有建档记录有就返回patientid
63		- *
	63	+ *valueType 1体重身高 2、血压和脉搏
64	64	* @return
65	65	*/
66	66	@RequestMapping(value = "/getPatientBuildId", method = RequestMethod.GET)
67	67	@ResponseBody
68	68	public String getPatientBuildId(@RequestParam(required = true) String certType,
69	69	@RequestParam(required = true) String certNo,
70		- @RequestParam(required = true) String hospitalId) {
71		- return bookbuildingFacade.getPatientBuildId(certType,certNo,hospitalId);
	70	+ @RequestParam(required = true) String hospitalId,
	71	+ @RequestParam(required = true) Integer valueType) {
	72	+ return bookbuildingFacade.getPatientBuildId(certType,certNo,hospitalId,valueType);
72	73	}
73	74
74	75	/**

...	...	@@ -34,6 +34,9 @@
34	34	import org.slf4j.LoggerFactory;
35	35	import org.springframework.beans.factory.annotation.Autowired;
36	36	import org.springframework.data.domain.Sort;
	37	+import org.springframework.data.mongodb.core.MongoTemplate;
	38	+import org.springframework.data.mongodb.core.query.Criteria;
	39	+import org.springframework.data.mongodb.core.query.Query;
37	40	import org.springframework.stereotype.Component;
38	41
39	42	import javax.servlet.http.HttpServletResponse;
...	...	@@ -134,6 +137,9 @@
134	137	@Autowired
135	138	private PatientServiceFacade patientServiceFacade;
136	139
	140	+ @Autowired
	141	+ private MongoTemplate mongoTemplate;
	142	+
137	143	/**
138	144	* 根据患者的建档ID，查询还未使用的免费产检查券
139	145	*
...	...	@@ -1865,7 +1871,7 @@
1865	1871	}
1866	1872
1867	1873
1868		- public String getPatientBuildId(String certType, String certNo,String hospitalId) {
	1874	+ public String getPatientBuildId(String certType, String certNo,String hospitalId,Integer valueType) {
1869	1875	PatientsQuery patientsQuery = new PatientsQuery();
1870	1876	patientsQuery.setCardNo(certNo);
1871	1877	patientsQuery.setPcerteTypeId(certType);
...	...	@@ -1876,6 +1882,15 @@
1876	1882	if (CollectionUtils.isNotEmpty(patients))
1877	1883	{
1878	1884	patientId = patients.get(0).getId();
	1885	+ if (valueType == 1)
	1886	+ {
	1887	+ PatientWeight pw = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients.get(0).getPid())), PatientWeight.class);
	1888	+ if (pw == null)
	1889	+ {
	1890	+ patientId = "";
	1891	+ }
	1892	+ }
	1893	+
1879	1894	}
1880	1895	return patientId;
1881	1896	}