jiangjiazhi / regional-platform

Commit dc99e62a21d725b683657f97147fca1429a1b9b1

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

update code

Showing 7 changed files with 263 additions and 202 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java
platform-msg-generate/src/main/resources/database.properties
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.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/ResidentsArchiveFacade.java

...	...	@@ -19,7 +19,10 @@
19	19
20	20	YUN_YI_BAN_ZHI_DAO("98i1P6zh3slBxEKLftweaESnnem4w6SDmzvJIBWRXNE","孕妇一般指导"),//孕妇
21	21	CHAN_YI_BAN_ZHI_DAO("H2_ucLqVEbsZAv-EZcmUDpD1Zul5NGqMoJktHT0u4gw","产妇一般指导"),//产妇
22		- BABY_YI_BAN_ZHI_DAO("dqvyESU8UXx1V3cIMQDqj4PLxI6T9-sgihQcs3ZGL9E","儿童一般指导");//儿童
	22	+ BABY_YI_BAN_ZHI_DAO("dqvyESU8UXx1V3cIMQDqj4PLxI6T9-sgihQcs3ZGL9E","儿童一般指导"),//儿童
	23	+
	24	+ YI_SHENG_ZHI_DAO("OggqiSHitLkCgSLCaCH72reCZzaw5NyG8iO56InQiQg","医生指导"),//指导
	25	+ WEI_JI_ZHI_DAO("fNkkLSp_gS-YWvzji6gwgdTddl4XBlk8SNP7FRksrfk","危急值提醒");//危急值提醒
23	26
24	27
25	28

...	...	@@ -19,7 +19,7 @@
19	19	public class MsgGenerateController extends BaseController {
20	20
21	21	// private static final Logger logger = LoggerFactory.getLogger(MsgGenerateController.class);
22		-//
	22	+////
23	23	// @Autowired
24	24	// private IMsgGenerateService msgGenerateService;
25	25	//

...	...	@@ -154,8 +154,8 @@
154	154	}
155	155
156	156	public static void main(String[] args) {
157		- Map<String,List<MessageContent>> list = getMessageTemplateMap("216",
158		- AmsServiceTypeEnum.YUN_GUIDE);
	157	+ Map<String,List<MessageContent>> list = getMessageTemplateMap("206",
	158	+ AmsServiceTypeEnum.CHILD_GUIDE);
159	159	List<MessageContent> msgs = list.get("年龄≥35岁");
160	160	System.out.println(msgs);
161	161	}

1	1	maindata.driver=com.mysql.jdbc.Driver
	2	+#maindata.jdbcurl=jdbc:mysql://119.90.43.68:3307/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
	3	+#maindata.username=platform
	4	+#maindata.password=platform123
	5	+#
	6	+#
	7	+#mongo.db.host=119.90.43.68
	8	+#mongo.db.port=27019
	9	+#mongo.db.dbname=platform
	10	+#mongo.db.username=platform
	11	+#mongo.db.password=platform123
	12	+
	13	+
	14	+
2	15	maindata.jdbcurl=${mysql.jdbcurl}
3	16	maindata.username=${mysql.db.name}
4	17	maindata.password=${mysql.db.password}

...	...	@@ -832,148 +832,148 @@
832	832	/**
833	833	* 创建建档短信
834	834	*/
835		- public void createBuildSms(BabyModel babyModel) {
	835	+// public void createBuildSms(BabyModel babyModel) {
	836	+//
	837	+// //判断医院是否启动和对应的服务项是否启用
	838	+// SmsConfigModel configModel = new SmsConfigModel();
	839	+// BaseResponse response = smsConfigFacade.hospitalIsStart(babyModel.getHospitalId(), configModel, SmsServiceEnums.FWKT.getId());
	840	+// if (response != null) {
	841	+// return;
	842	+// }
	843	+//
	844	+// ExceptionUtils.catchException("儿童建档1---------->" + babyModel.getMphone() + ";name=" + babyModel.getName());
	845	+//
	846	+// SmsTemplateQuery query = new SmsTemplateQuery();
	847	+// query.setYn(YnEnums.YES.getId());
	848	+// query.setStatus(1);
	849	+// query.setHospitalId(babyModel.getHospitalId());
	850	+// query.setServiceObj(ServiceObjEnums.BABYOBJ.getId());
	851	+// query.setSpecialDateType(SpecialDateEnums.JD.getId());
	852	+//
	853	+// Integer serviceType = babyModel.getServiceType();
	854	+// Integer serviceStatus = babyModel.getServiceStatus();
	855	+// List<SmsTemplateModel> sendList = new ArrayList<>();
	856	+// List<SmsTemplateModel> temps = smsTemplateService.querySmsTemplates(query);
	857	+// if (CollectionUtils.isNotEmpty(temps)) {
	858	+//
	859	+// for (SmsTemplateModel temp : temps) {
	860	+// if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) {
	861	+// sendList.add(temp);
	862	+// break;
	863	+// }
	864	+// }
	865	+//
	866	+// for (SmsTemplateModel temp : temps) {
	867	+// if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId()) {
	868	+// if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() \|\| serviceStatus == ServiceStatusEnums.NO_OPEN.getId() \|\| serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId()) {
	869	+// sendList.add(temp);
	870	+// break;
	871	+// }
	872	+// }
	873	+// }
	874	+//
	875	+// for (SmsTemplateModel temp : temps) {
	876	+// if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()) {
	877	+// if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() \|\| serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId()
	878	+// \|\| serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() \|\| serviceStatus == ServiceStatusEnums.SUSPEND.getId()) {
	879	+// sendList.add(temp);
	880	+// break;
	881	+// }
	882	+// }
	883	+// }
	884	+//
	885	+//
	886	+// for (SmsTemplateModel temp : temps) {
	887	+// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) {
	888	+// if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() \|\| serviceStatus == ServiceStatusEnums.ADD_OPEN.getId()) {
	889	+// sendList.add(temp);
	890	+// break;
	891	+// }
	892	+// }
	893	+// }
	894	+//
	895	+//
	896	+// for (SmsTemplateModel temp : temps) {
	897	+// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId()) {
	898	+// if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() \|\| serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId()) {
	899	+// sendList.add(temp);
	900	+// break;
	901	+// }
	902	+// }
	903	+// }
	904	+//
	905	+//
	906	+// for (SmsTemplateModel temp : temps) {
	907	+// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) {
	908	+// if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() \|\| serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()) {
	909	+// sendList.add(temp);
	910	+// break;
	911	+// }
	912	+// }
	913	+// }
	914	+//
	915	+//
	916	+// for (SmsTemplateModel temp : temps) {
	917	+// if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) {
	918	+// sendList.add(temp);
	919	+// break;
	920	+// }
	921	+// }
	922	+//
	923	+// if (CollectionUtils.isNotEmpty(sendList)) {
	924	+//
	925	+//
	926	+// //短信前缀
	927	+// String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, babyModel.getBuildDoctor());
	928	+// for (SmsTemplateModel templateModel : sendList) {
	929	+// if (templateModel != null && templateModel.getStatus() == 1) {
	930	+// ExceptionUtils.catchException("儿童建档2---------->"+babyModel.getMphone()+";name="+babyModel.getName());
	931	+// MessageListRequest smsList = new MessageListRequest();
	932	+// List<MessageRequest> messages = new ArrayList<>();
	933	+// MessageRequest mr = new MessageRequest();
	934	+// String content = "【" + messagePrefix + "】" + templateModel.getContent();
	935	+// mr.setContent(StringUtils.replaceBaby(babyModel.getName(), babyModel.getBirth(), content));
	936	+// mr.setObjType(ServiceObjEnums.BABYOBJ.getId());
	937	+// mr.setPhone(babyModel.getMphone());
	938	+// //短信商
	939	+// mr.setServiceType(SmsProviderEnums.YM.getId());
	940	+// mr.setTypeId(ProjectTypeEnums.YNXT.getId());
	941	+// mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
	942	+// mr.setSubTypeId(SmsServiceEnums.FWKT.getId());
	943	+// mr.setStatus(SmsStatusEnums.WFS.getId());
	944	+// mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
	945	+//
	946	+// mr.setExt1(babyModel.getHospitalId());
	947	+// mr.setExt2(templateModel.getId());
	948	+// mr.setExt3(babyModel.getId());
	949	+// messages.add(mr);
	950	+//
	951	+// if (CollectionUtils.isNotEmpty(messages)) {
	952	+// smsList.setTypeId(ProjectTypeEnums.YNXT.getId());
	953	+// smsList.setMessages(messages);
	954	+// if ("4".equals(HIS_VERSION))
	955	+// {
	956	+// //秦皇岛建档
	957	+// if (syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) {
	958	+// ExceptionUtils.catchException("儿童建档3---------->"+babyModel.getMphone()+";name="+babyModel.getName());
	959	+// }
	960	+// }
	961	+// else
	962	+// {
	963	+// //线上
	964	+// MessageCenterService.saveSmsCenter(smsList);
	965	+// ExceptionUtils.catchException("儿童建档3---------->" + babyModel.getMphone() + ";name=" + babyModel.getName());
	966	+// }
	967	+// }
	968	+// }
	969	+// }
	970	+// }
	971	+//
	972	+//
	973	+// }
	974	+// }
836	975
837		- //判断医院是否启动和对应的服务项是否启用
838		- SmsConfigModel configModel = new SmsConfigModel();
839		- BaseResponse response = smsConfigFacade.hospitalIsStart(babyModel.getHospitalId(), configModel, SmsServiceEnums.FWKT.getId());
840		- if (response != null) {
841		- return;
842		- }
843	976
844		- ExceptionUtils.catchException("儿童建档1---------->" + babyModel.getMphone() + ";name=" + babyModel.getName());
845		-
846		- SmsTemplateQuery query = new SmsTemplateQuery();
847		- query.setYn(YnEnums.YES.getId());
848		- query.setStatus(1);
849		- query.setHospitalId(babyModel.getHospitalId());
850		- query.setServiceObj(ServiceObjEnums.BABYOBJ.getId());
851		- query.setSpecialDateType(SpecialDateEnums.JD.getId());
852		-
853		- Integer serviceType = babyModel.getServiceType();
854		- Integer serviceStatus = babyModel.getServiceStatus();
855		- List<SmsTemplateModel> sendList = new ArrayList<>();
856		- List<SmsTemplateModel> temps = smsTemplateService.querySmsTemplates(query);
857		- if (CollectionUtils.isNotEmpty(temps)) {
858		-
859		- for (SmsTemplateModel temp : temps) {
860		- if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) {
861		- sendList.add(temp);
862		- break;
863		- }
864		- }
865		-
866		- for (SmsTemplateModel temp : temps) {
867		- if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId()) {
868		- if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() \|\| serviceStatus == ServiceStatusEnums.NO_OPEN.getId() \|\| serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId()) {
869		- sendList.add(temp);
870		- break;
871		- }
872		- }
873		- }
874		-
875		- for (SmsTemplateModel temp : temps) {
876		- if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()) {
877		- if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() \|\| serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId()
878		- \|\| serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() \|\| serviceStatus == ServiceStatusEnums.SUSPEND.getId()) {
879		- sendList.add(temp);
880		- break;
881		- }
882		- }
883		- }
884		-
885		-
886		- for (SmsTemplateModel temp : temps) {
887		- if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) {
888		- if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() \|\| serviceStatus == ServiceStatusEnums.ADD_OPEN.getId()) {
889		- sendList.add(temp);
890		- break;
891		- }
892		- }
893		- }
894		-
895		-
896		- for (SmsTemplateModel temp : temps) {
897		- if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId()) {
898		- if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() \|\| serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId()) {
899		- sendList.add(temp);
900		- break;
901		- }
902		- }
903		- }
904		-
905		-
906		- for (SmsTemplateModel temp : temps) {
907		- if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) {
908		- if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() \|\| serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()) {
909		- sendList.add(temp);
910		- break;
911		- }
912		- }
913		- }
914		-
915		-
916		- for (SmsTemplateModel temp : temps) {
917		- if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) {
918		- sendList.add(temp);
919		- break;
920		- }
921		- }
922		-
923		- if (CollectionUtils.isNotEmpty(sendList)) {
924		-
925		-
926		- //短信前缀
927		- String messagePrefix = smsConfigFacade.getMsgPrefix(configModel, babyModel.getBuildDoctor(),ServiceObjEnums.YUNOBJ.getId());
928		- for (SmsTemplateModel templateModel : sendList) {
929		- if (templateModel != null && templateModel.getStatus() == 1) {
930		- ExceptionUtils.catchException("儿童建档2---------->"+babyModel.getMphone()+";name="+babyModel.getName());
931		- MessageListRequest smsList = new MessageListRequest();
932		- List<MessageRequest> messages = new ArrayList<>();
933		- MessageRequest mr = new MessageRequest();
934		- String content = "【" + messagePrefix + "】" + templateModel.getContent();
935		- mr.setContent(StringUtils.replaceBaby(babyModel.getName(), babyModel.getBirth(), content));
936		- mr.setObjType(ServiceObjEnums.BABYOBJ.getId());
937		- mr.setPhone(babyModel.getMphone());
938		- //短信商
939		- mr.setServiceType(SmsProviderEnums.YM.getId());
940		- mr.setTypeId(ProjectTypeEnums.YNXT.getId());
941		- mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
942		- mr.setSubTypeId(SmsServiceEnums.FWKT.getId());
943		- mr.setStatus(SmsStatusEnums.WFS.getId());
944		- mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
945		-
946		- mr.setExt1(babyModel.getHospitalId());
947		- mr.setExt2(templateModel.getId());
948		- mr.setExt3(babyModel.getId());
949		- messages.add(mr);
950		-
951		- if (CollectionUtils.isNotEmpty(messages)) {
952		- smsList.setTypeId(ProjectTypeEnums.YNXT.getId());
953		- smsList.setMessages(messages);
954		- if ("4".equals(HIS_VERSION))
955		- {
956		- //秦皇岛建档
957		- if (syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) {
958		- ExceptionUtils.catchException("儿童建档3---------->"+babyModel.getMphone()+";name="+babyModel.getName());
959		- }
960		- }
961		- else
962		- {
963		- //线上
964		- MessageCenterService.saveSmsCenter(smsList);
965		- ExceptionUtils.catchException("儿童建档3---------->" + babyModel.getMphone() + ";name=" + babyModel.getName());
966		- }
967		- }
968		- }
969		- }
970		- }
971		-
972		-
973		- }
974		- }
975		-
976		-
977	977	/**
978	978	* 准备修改和添加的孕妇建档数据
979	979	*
980	980
...	...	@@ -2241,10 +2241,10 @@
2241	2241	public BaseResponse sendBabyGuideSms(BabyGuideSmsequest request, Integer userId) {
2242	2242	String hospitalId = "";
2243	2243
2244		-
	2244	+ Users dbuser = null;
2245	2245	//得到当前登录的医院id
2246	2246	if (userId != null) {
2247		- Users dbuser = usersService.getUsers(userId);
	2247	+ dbuser = usersService.getUsers(userId);
2248	2248	if (dbuser != null) {
2249	2249	hospitalId = String.valueOf(dbuser.getOrgId());
2250	2250	}
...	...	@@ -2258,8 +2258,6 @@
2258	2258	}
2259	2259
2260	2260
2261		- MessageListRequest smsList = new MessageListRequest();
2262		- List<MessageRequest> messages = new ArrayList<>();
2263	2261
2264	2262	List<BabyModel> sendModels = new ArrayList<>();
2265	2263	if (CollectionUtils.isNotEmpty(request.getIds())) {
2266	2264
2267	2265
2268	2266
2269	2267
2270	2268
2271	2269
2272	2270
...	...	@@ -2282,26 +2280,43 @@
2282	2280	sendModels = getBabayListByCondition(request.getRequest(), false, babyQuery);
2283	2281	}
2284	2282
	2283	+ com.lyms.platform.beans.MessageListRequest smsList = new com.lyms.platform.beans.MessageListRequest();
	2284	+ List<com.lyms.platform.beans.MessageRequest> messages = new ArrayList<>();
	2285	+
2285	2286	if (CollectionUtils.isNotEmpty(sendModels)) {
2286	2287	for (BabyModel model : sendModels) {
2287		- if (model != null && StringUtils.isNotEmpty(model.getMphone())) {
	2288	+ if (model != null) {
2288	2289	//短信前缀
2289		- String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, model.getBuildDoctor());
2290		- MessageRequest mr = new MessageRequest();
2291		- mr.setContent("【" + messagePrefix + "】" + request.getSmsContent());
	2290	+ String messagePrefix = smsConfigFacade.getMsgPrefix(configModel, model.getBuildDoctor(),ServiceObjEnums.BABYOBJ.getId());
	2291	+ com.lyms.platform.beans.MessageRequest mr = new com.lyms.platform.beans.MessageRequest();
	2292	+ String content = "【" + messagePrefix + "】" + request.getSmsContent();
	2293	+
	2294	+ mr.setFirst(content);
2292	2295	mr.setObjType(ServiceObjEnums.BABYOBJ.getId());
2293	2296	mr.setPhone(model.getMphone());
2294		- //短信商
2295		- mr.setServiceType(SmsProviderEnums.YM.getId());
2296	2297	mr.setTypeId(ProjectTypeEnums.YNXT.getId());
2297	2298	mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
2298	2299	mr.setSubTypeId(SmsServiceEnums.YSGXHZD.getId());
	2300	+ mr.setStatus(SmsStatusEnums.WFS.getId());
2299	2301	mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
2300	2302
2301		- mr.setStatus(SmsStatusEnums.WFS.getId());
	2303	+ mr.setHospitalId(model.getHospitalId());
	2304	+ mr.setPatientId(model.getId());
2302	2305
2303		- mr.setExt1(String.valueOf(model.getHospitalId()));
	2306	+ String doctorName = "";
	2307	+ if (dbuser != null)
	2308	+ {
	2309	+ doctorName = dbuser.getName();
	2310	+ }
	2311	+
	2312	+ mr.setKeyword1(doctorName);
	2313	+ mr.setKeyword2(DateUtil.getyyyy_MM_dd(new Date()));
	2314	+ mr.setRemark("");
	2315	+ mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));
	2316	+ mr.setWxTempId(WxTempleteIdEnums.YI_SHENG_ZHI_DAO.getId());
	2317	+
2304	2318	messages.add(mr);
	2319	+
2305	2320	}
2306	2321	}
2307	2322	}
2308	2323
2309	2324
...	...	@@ -2310,19 +2325,16 @@
2310	2325	smsList.setTypeId(ProjectTypeEnums.YNXT.getId());
2311	2326	smsList.setMessages(messages);
2312	2327	//调用发送接口
2313		-// if (!syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) {
2314		-// MessageCenterService.saveSmsCenter(smsList);
2315		-// }
2316	2328	if ("4".equals(HIS_VERSION))
2317	2329	{
2318	2330	//秦皇岛
2319	2331	//保存到同步表中
2320		- syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1());
	2332	+ syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getHospitalId());
2321	2333	}
2322	2334	else
2323	2335	{
2324	2336	//保存到短信中心线上
2325		- MessageCenterService.saveSmsCenter(smsList);
	2337	+ MessageCenterService.saveMsgCenter(smsList);
2326	2338	}
2327	2339
2328	2340	}

...	...	@@ -616,17 +616,26 @@
616	616
617	617	public BaseResponse patientGuildSms(PatientGuideSmsRequest patientGuideSmsRequest, Integer userId) {
618	618
619		- String hospital = autoMatchFacade.getHospitalId(userId);
	619	+ String hospitalId = "";
620	620
	621	+ Users dbuser = null;
	622	+ //得到当前登录的医院id
	623	+ if (userId != null) {
	624	+ dbuser = usersService.getUsers(userId);
	625	+ if (dbuser != null) {
	626	+ hospitalId = String.valueOf(dbuser.getOrgId());
	627	+ }
	628	+ }
	629	+
621	630	//判断医院是否启动和对应的服务项是否启用
622	631	SmsConfigModel configModel = new SmsConfigModel();
623		- BaseResponse response = smsConfigFacade.hospitalIsStart(hospital, configModel, SmsServiceEnums.YSGXHZD.getId());
	632	+ BaseResponse response = smsConfigFacade.hospitalIsStart(hospitalId, configModel, SmsServiceEnums.YSGXHZD.getId());
624	633	if (response != null) {
625	634	return response;
626	635	}
627	636
628		- MessageListRequest smsList = new MessageListRequest();
629		- List<MessageRequest> messages = new ArrayList<>();
	637	+ com.lyms.platform.beans.MessageListRequest smsList = new com.lyms.platform.beans.MessageListRequest();
	638	+ List<com.lyms.platform.beans.MessageRequest> messages = new ArrayList<>();
630	639	List<Patients> sendModels = new ArrayList<>();
631	640	if (CollectionUtils.isNotEmpty(patientGuideSmsRequest.getIds())) {
632	641	for (String patientId : patientGuideSmsRequest.getIds()) {
633	642
634	643
635	644
636	645
637	646
...	...	@@ -636,26 +645,41 @@
636	645	}
637	646	}
638	647	if (CollectionUtils.isNotEmpty(sendModels)) {
639		- for (Patients model : sendModels) {
640		- if (model != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getPhone())) {
641		- MessageRequest mr = new MessageRequest();
	648	+ for (Patients patient : sendModels) {
	649	+ if (patient != null) {
642	650
643	651	//短信前缀
644		- String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, model.getBookbuildingDoctor());
645		- mr.setContent("【" + messagePrefix + "】" + patientGuideSmsRequest.getSmsContent());
646		- mr.setObjType(Integer.valueOf(patientGuideSmsRequest.getType()));
647		- mr.setPhone(model.getPhone());
648		- //短信商
649		- mr.setServiceType(SmsProviderEnums.YM.getId());
	652	+ String messagePrefix = smsConfigFacade.getMsgPrefix(configModel, patient.getBookbuildingDoctor(), ServiceObjEnums.YUNOBJ.getId());
	653	+
	654	+ com.lyms.platform.beans.MessageRequest mr = new com.lyms.platform.beans.MessageRequest();
	655	+
	656	+ String content = patientGuideSmsRequest.getSmsContent();
	657	+
	658	+ mr.setFirst("【" + messagePrefix + "】" + content);
	659	+ mr.setObjType(ServiceObjEnums.YUNOBJ.getId());
	660	+ mr.setPhone(patient.getPhone());
	661	+ mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
650	662	mr.setTypeId(ProjectTypeEnums.YNXT.getId());
651	663	mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
652	664	mr.setSubTypeId(SmsServiceEnums.YSGXHZD.getId());
653		- mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
654		-
655	665	mr.setStatus(SmsStatusEnums.WFS.getId());
	666	+ mr.setHospitalId(patient.getHospitalId());
	667	+ mr.setPatientId(patient.getId());
656	668
657		- mr.setExt1(String.valueOf(model.getHospitalId()));
	669	+ String doctorName = "";
	670	+ if (dbuser != null)
	671	+ {
	672	+ doctorName = dbuser.getName();
	673	+ }
	674	+
	675	+ mr.setKeyword1(doctorName);
	676	+ mr.setKeyword2(DateUtil.getyyyy_MM_dd(new Date()));
	677	+ mr.setRemark("");
	678	+ mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));
	679	+
	680	+ mr.setWxTempId(WxTempleteIdEnums.YI_SHENG_ZHI_DAO.getId());
658	681	messages.add(mr);
	682	+
659	683	}
660	684	}
661	685	}
662	686
663	687
664	688
...	...	@@ -663,21 +687,18 @@
663	687	if (CollectionUtils.isNotEmpty(messages)) {
664	688	smsList.setTypeId(ProjectTypeEnums.YNXT.getId());
665	689	smsList.setMessages(messages);
	690	+ smsList.setMessages(messages);
666	691	//调用发送接口
667		-// if (!syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) {
668		-// MessageCenterService.saveSmsCenter(smsList);
669		-// }
670		-
671	692	if ("4".equals(HIS_VERSION))
672	693	{
673	694	//秦皇岛
674	695	//保存到同步表中
675		- syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1());
	696	+ syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getHospitalId());
676	697	}
677	698	else
678	699	{
679	700	//保存到短信中心线上
680		- MessageCenterService.saveSmsCenter(smsList);
	701	+ MessageCenterService.saveMsgCenter(smsList);
681	702	}
682	703	}
683	704	}

...	...	@@ -736,10 +736,12 @@
736	736	* @return
737	737	*/
738	738	public BaseResponse womenGuildSms(WomenGuideSmsRequest request,Integer userId){
	739	+
739	740	String hospitalId = "";
	741	+ Users dbuser = null;
740	742	//得到当前登录的医院id
741	743	if (userId != null) {
742		- Users dbuser = usersService.getUsers(userId);
	744	+ dbuser = usersService.getUsers(userId);
743	745	if (dbuser != null) {
744	746	hospitalId = String.valueOf(dbuser.getOrgId());
745	747	}
...	...	@@ -756,8 +758,8 @@
756	758	return response;
757	759	}
758	760
759		- MessageListRequest smsList = new MessageListRequest();
760		- List<MessageRequest> messages = new ArrayList<>();
	761	+ com.lyms.platform.beans.MessageListRequest smsList = new com.lyms.platform.beans.MessageListRequest();
	762	+ List<com.lyms.platform.beans.MessageRequest> messages = new ArrayList<>();
761	763
762	764	List<ResidentsArchiveModel> sendModels = new ArrayList<>();
763	765	if (CollectionUtils.isNotEmpty(request.getIds())) {
764	766
765	767
766	768
767	769
...	...	@@ -776,22 +778,35 @@
776	778
777	779	if (CollectionUtils.isNotEmpty(sendModels)) {
778	780	for (ResidentsArchiveModel model : sendModels){
779		- if (model!=null && StringUtils.isNotEmpty(model.getPhone())){
780		- MessageRequest mr = new MessageRequest();
781		- String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, model.getBuildDoctor());
782		- mr.setContent("【" + messagePrefix + "】" + request.getSmsContent());
783		- mr.setObjType(ServiceObjEnums.FUNV.getId());
	781	+ if (model != null){
	782	+ //短信前缀
	783	+ String messagePrefix = smsConfigFacade.getMsgPrefix(configModel, model.getBuildDoctor(), ServiceObjEnums.YUNOBJ.getId());
	784	+ com.lyms.platform.beans.MessageRequest mr = new com.lyms.platform.beans.MessageRequest();
	785	+ String content = request.getSmsContent();
	786	+
	787	+ mr.setFirst("【" + messagePrefix + "】" + content);
	788	+ mr.setObjType(ServiceObjEnums.YUNOBJ.getId());
784	789	mr.setPhone(model.getPhone());
785		- //短信商
786		- mr.setServiceType(SmsProviderEnums.YM.getId());
	790	+ mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
787	791	mr.setTypeId(ProjectTypeEnums.YNXT.getId());
788	792	mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
789	793	mr.setSubTypeId(SmsServiceEnums.YSGXHZD.getId());
790		- mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
791		-
792	794	mr.setStatus(SmsStatusEnums.WFS.getId());
	795	+ mr.setHospitalId(model.getHospitalId());
	796	+ mr.setPatientId(model.getId());
793	797
794		- mr.setExt1(String.valueOf(model.getHospitalId()));
	798	+ String doctorName = "";
	799	+ if (dbuser != null)
	800	+ {
	801	+ doctorName = dbuser.getName();
	802	+ }
	803	+
	804	+ mr.setKeyword1(doctorName);
	805	+ mr.setKeyword2(DateUtil.getyyyy_MM_dd(new Date()));
	806	+ mr.setRemark("");
	807	+ mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));
	808	+
	809	+ mr.setWxTempId(WxTempleteIdEnums.YI_SHENG_ZHI_DAO.getId());
795	810	messages.add(mr);
796	811	}
797	812	}
798	813
799	814
800	815
801	816
...	...	@@ -800,22 +815,19 @@
800	815	if (CollectionUtils.isNotEmpty(messages)) {
801	816	smsList.setTypeId(ProjectTypeEnums.YNXT.getId());
802	817	smsList.setMessages(messages);
	818	+ smsList.setMessages(messages);
803	819	//调用发送接口
804		-// if (!syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) {
805		-// MessageCenterService.saveSmsCenter(smsList);
806		-// }
807	820	if ("4".equals(HIS_VERSION))
808	821	{
809	822	//秦皇岛
810	823	//保存到同步表中
811		- syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1());
	824	+ syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getHospitalId());
812	825	}
813	826	else
814	827	{
815	828	//保存到短信中心线上
816		- MessageCenterService.saveSmsCenter(smsList);
	829	+ MessageCenterService.saveMsgCenter(smsList);
817	830	}
818		-
819	831	}
820	832	}
821	833	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");