jiangjiazhi / regional-platform

Commit 15b1f3fc95813772007cfc8a3522f72b12dd6aec

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

分娩记录导出

Showing 3 changed files with 17 additions and 8 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-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java

...	...	@@ -49,7 +49,8 @@
49	49	EBGQTX(35,"儿童儿保过期提醒",32,"2"),
50	50	FWDGTX(36,"服务订购提醒",18,"1"),
51	51	JSGWZD(37,"及时高危指导",1,""),
52		- CSJGTZ(38,"产筛结果通知",21,"1");
	52	+ CSJGTZ(38,"产筛结果通知",21,"1"),
	53	+ YFXXJSTX(39,"孕妇学校课程结束提醒",21,"1,3");
53	54
54	55	private SmsServiceEnums(int id,String name,int pid,String serviceObj){
55	56	this.id = id;

...	...	@@ -19,7 +19,7 @@
19	19	BABY_YI_BAN_ZHI_DAO("dqvyESU8UXx1V3cIMQDqj4PLxI6T9-sgihQcs3ZGL9E","儿童一般指导"),//儿童
20	20	YUN_XUE_KE_CHEN_TX("UEwcdz3lJL3NR38KRqN6yTO4nUvRgym5mlXl4jXQBik","孕妇学校课程提醒"),//孕妇学校课程提醒
21	21
22		- YUN_XUE_JSTX("","孕妇学校课程结束提醒"),//孕妇学校课程结束提醒
	22	+ YUN_XUE_JSTX("jBHP98VRjIf3d0TDnor89V_z2IQ9b0ecKW3fAZW4FS8","孕妇学校课程结束提醒"),//孕妇学校课程结束提醒
23	23
24	24	FU_WU_DING_GOU_TX("UEwcdz3lJL3NR38KRqN6yTO4nUvRgym5mlXl4jXQBik","服务订购提醒"),//服务订购提醒和收费成功后的高危提醒
25	25	YI_SHENG_ZHI_DAO("OggqiSHitLkCgSLCaCH72reCZzaw5NyG8iO56InQiQg","医生指导"),//指导

...	...	@@ -16,9 +16,8 @@
16	16	import com.lyms.platform.operate.web.utils.BabyListTask;
17	17	import com.lyms.platform.operate.web.utils.MessageCenterService;
18	18	import com.lyms.platform.operate.web.worker.CourseCountWorker;
19		-import com.lyms.platform.permission.model.PatientService;
20		-import com.lyms.platform.permission.model.UserScore;
21		-import com.lyms.platform.permission.model.Users;
	19	+import com.lyms.platform.permission.model.*;
	20	+import com.lyms.platform.permission.service.OrganizationService;
22	21	import com.lyms.platform.permission.service.UsersService;
23	22	import com.lyms.platform.pojo.*;
24	23	import com.lyms.platform.query.CourseEvalQuery;
...	...	@@ -67,6 +66,9 @@
67	66	private SmsConfigFacade smsConfigFacade;
68	67
69	68	@Autowired
	69	+ private OrganizationService organizationService;
	70	+
	71	+ @Autowired
70	72	private CourseEvalService courseEvalService;
71	73
72	74	@Autowired
...	...	@@ -437,6 +439,12 @@
437	439
438	440	private void saveMsg(String hospitalId,String phone,String patientId,String courseName,String doctorName,String patientCourseId,String courseId)
439	441	{
	442	+
	443	+ OrganizationQuery orgQuery = new OrganizationQuery();
	444	+ orgQuery.setYn(YnEnums.YES.getId());
	445	+ orgQuery.setId(Integer.parseInt(hospitalId));
	446	+ List<Organization> list = organizationService.queryHospitals(orgQuery);
	447	+
440	448	//判断医院是否启动和对应的服务项是否启用
441	449	SmsConfigModel configModel = new SmsConfigModel();
442	450	// 1 推送服务， 2 推送和短信服务 3短信服务，
443	451
...	...	@@ -449,13 +457,13 @@
449	457	List<MsgRequest> messages = new ArrayList<>();
450	458	MsgRequest mr = new MsgRequest();
451	459
452		- String content = "【" + messagePrefix + "】本次孕妇学校课程已结束,请对本次课程内容和讲解医生进行评价。";
	460	+ String content = "【" + messagePrefix + "】您本次参加的孕妇学校课程已经结束，请点击详情回顾课程内容并对本次课程评分。我们会根据您的评价结果相应做相应的评估的课程调整等。";
453	461	mr.setFirst(content);
454	462	mr.setObjType(ServiceObjEnums.YUNOBJ.getId());
455	463	mr.setPhone(phone);
456	464	mr.setTypeId(ProjectTypeEnums.YNXT.getId());
457	465	mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
458		- mr.setSubTypeId(SmsServiceEnums.YFXXKCTX.getId());
	466	+ mr.setSubTypeId(SmsServiceEnums.YFXXJSTX.getId());
459	467	mr.setStatus(SmsStatusEnums.WFS.getId());
460	468	mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
461	469
...	...	@@ -463,7 +471,7 @@
463	471	mr.setTempId(patientCourseId);
464	472	mr.setPatientId(patientId);
465	473
466		- mr.setKeyword1(courseName);
	474	+ mr.setKeyword1(list.get(0).getName());
467	475	mr.setKeyword2(doctorName);
468	476	mr.setRemark(courseId);
469	477	mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));