jiangjiazhi / regional-platform

Commit f7e792f1ada1d9d1e9db60848862814ff0973a4d

Authored by liquanyu about 8 years ago

Exists in master and in 6 other branches

update code

Showing 5 changed files with 65 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.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/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

...	...	@@ -113,10 +113,11 @@
113	113	Connection conn = ConnTools.makeFmConnection();
114	114	QueryRunner queryRunner = new QueryRunner();
115	115	SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMddHH:mm:ss");
	116	+ SimpleDateFormat fmt2 = new SimpleDateFormat("yyyyMMdd");
116	117	SimpleDateFormat fmt1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
117	118	try {
118	119	String sql ="select "+cloumns+" from JHMK_FMJL where " +
119		- " CONVERT(DATETIME,left(SSRQ,8)+' '+RIGHT(SSRQ,8),20) > CONVERT(DATETIME,'"+start+"', 120) and CONVERT(DATETIME,left(SSRQ,8)+' '+RIGHT(SSRQ,8),20) <= CONVERT(DATETIME,'"+end+"', 120)" +
	120	+ " CONVERT(DATETIME,left(JLRQ,8)+' '+RIGHT(JLRQ,8),20) > CONVERT(DATETIME,'"+start+"', 120) and CONVERT(DATETIME,left(JLRQ,8)+' '+RIGHT(JLRQ,8),20) <= CONVERT(DATETIME,'"+end+"', 120)" +
120	121	" and SYXH not in (select SYXH from JHMK_FMJL where JSZ is not null and SC is not null and TZ is not null and YFZ is not null and SH is not null and CCQK is not null and CCQK <> '' " +
121	122	" and (SFFZRSTDT = ' 是 ' or SFSTDT = ' 是 ')) ";
122	123
...	...	@@ -140,7 +141,15 @@
140	141	if (!StringUtils.isNotEmpty(dueDateStr)) {
141	142	continue;
142	143	}
143		- Date dueDate = fmt.parse(dueDateStr);
	144	+ Date dueDate = null;
	145	+ try{
	146	+ dueDate = fmt2.parse(dueDateStr);
	147	+ }catch (Exception e)
	148	+ {
	149	+ dueDate = fmt.parse(dueDateStr);
	150	+ }
	151	+
	152	+
144	153	FmPatInfo patInfo = getFmPatInfoById(item.getSyxh());
145	154	if (patInfo != null && StringUtils.isNotEmpty(patInfo.getPhone())) {
146	155	PatientsQuery query = new PatientsQuery();
...	...	@@ -280,7 +289,7 @@
280	289
281	290	String sql1="select "+cloumns+" from JHMK_FMJL where JSZ is not null and SC is not null and TZ is not null and YFZ is not null and CCQK is not null and CCQK <> '' " +
282	291	" and SH is not null and (SFFZRSTDT = ' 是 ' or SFSTDT = ' 是 ') and " +
283		- " CONVERT(DATETIME,left(SSRQ,8)+' '+RIGHT(SSRQ,8),20) > CONVERT(DATETIME,'"+start+"', 120) and CONVERT(DATETIME,left(SSRQ,8)+' '+RIGHT(SSRQ,8),20) <= CONVERT(DATETIME,'"+end+"', 120)";
	292	+ " CONVERT(DATETIME,left(JLRQ,8)+' '+RIGHT(JLRQ,8),20) > CONVERT(DATETIME,'"+start+"', 120) and CONVERT(DATETIME,left(JLRQ,8)+' '+RIGHT(JLRQ,8),20) <= CONVERT(DATETIME,'"+end+"', 120)";
284	293
285	294	if (StringUtils.isNotEmpty(syxh))
286	295	{
...	...	@@ -327,7 +336,13 @@
327	336	{
328	337	continue;
329	338	}
330		- Date dueDate = fmt.parse(dueDateStr);
	339	+ Date dueDate = null;
	340	+ try{
	341	+ dueDate = fmt2.parse(dueDateStr);
	342	+ }catch (Exception e)
	343	+ {
	344	+ dueDate = fmt.parse(dueDateStr);
	345	+ }
331	346	FmPatInfo patInfo = getFmPatInfoById(item.getSyxh());
332	347	if (patInfo != null && StringUtils.isNotEmpty(patInfo.getPhone()))
333	348	{

...	...	@@ -35,7 +35,7 @@
35	35	*/
36	36	@Controller
37	37	public class PregnantBuildController extends BaseController{
38		-
	38	+
39	39	@Autowired
40	40	private YunBookbuildingService yunBookbuildingService;
41	41

...	...	@@ -2008,9 +2008,21 @@
2008	2008	smsList.setTypeId(ProjectTypeEnums.YNXT.getId());
2009	2009	smsList.setMessages(messages);
2010	2010	//调用发送接口
2011		- if (!syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) {
	2011	+// if (!syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) {
	2012	+// MessageCenterService.saveSmsCenter(smsList);
	2013	+// }
	2014	+ if ("4".equals(HIS_VERSION))
	2015	+ {
	2016	+ //秦皇岛
	2017	+ //保存到同步表中
	2018	+ syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1());
	2019	+ }
	2020	+ else
	2021	+ {
	2022	+ //保存到短信中心线上
2012	2023	MessageCenterService.saveSmsCenter(smsList);
2013	2024	}
	2025	+
2014	2026	}
2015	2027	BaseResponse objectResponse = new BaseResponse();
2016	2028	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);

...	...	@@ -44,6 +44,9 @@
44	44	@Component
45	45	public class PatientFacade {
46	46	private static final Logger logger = LoggerFactory.getLogger(PatientFacade.class);
	47	+
	48	+ public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");
	49	+
47	50	@Autowired
48	51	private PatientsService patientsService;
49	52	@Autowired
...	...	@@ -610,7 +613,19 @@
610	613	smsList.setTypeId(ProjectTypeEnums.YNXT.getId());
611	614	smsList.setMessages(messages);
612	615	//调用发送接口
613		- if (!syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) {
	616	+// if (!syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) {
	617	+// MessageCenterService.saveSmsCenter(smsList);
	618	+// }
	619	+
	620	+ if ("4".equals(HIS_VERSION))
	621	+ {
	622	+ //秦皇岛
	623	+ //保存到同步表中
	624	+ syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1());
	625	+ }
	626	+ else
	627	+ {
	628	+ //保存到短信中心线上
614	629	MessageCenterService.saveSmsCenter(smsList);
615	630	}
616	631	}

...	...	@@ -42,6 +42,9 @@
42	42	@Component
43	43	public class ResidentsArchiveFacade{
44	44
	45	+
	46	+ public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");
	47	+
45	48	@Autowired
46	49	private ResidentsArchiveService residentsArchiveService;
47	50	@Autowired
48	51
...	...	@@ -781,9 +784,21 @@
781	784	smsList.setTypeId(ProjectTypeEnums.YNXT.getId());
782	785	smsList.setMessages(messages);
783	786	//调用发送接口
784		- if (!syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) {
	787	+// if (!syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) {
	788	+// MessageCenterService.saveSmsCenter(smsList);
	789	+// }
	790	+ if ("4".equals(HIS_VERSION))
	791	+ {
	792	+ //秦皇岛
	793	+ //保存到同步表中
	794	+ syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1());
	795	+ }
	796	+ else
	797	+ {
	798	+ //保存到短信中心线上
785	799	MessageCenterService.saveSmsCenter(smsList);
786	800	}
	801	+
787	802	}
788	803	}
789	804	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");