jiangjiazhi / regional-platform

Commit 3dd138f6cfcf121aa428a68889ae13bcd65f18e3

Authored by jiangjiazhi about 8 years ago

Exists in master and in 6 other branches

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/hospitalapi/whfy/VirtualCallService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java

...	...	@@ -22,6 +22,8 @@
22	22	import java.net.InetAddress;
23	23	import java.net.NetworkInterface;
24	24	import java.sql.*;
	25	+import java.text.ParseException;
	26	+import java.text.SimpleDateFormat;
25	27	import java.util.*;
26	28	import java.util.Date;
27	29
...	...	@@ -72,19 +74,12 @@
72	74	conn = makeHisConnection();
73	75	//1.1 普通登录 '1','200.200.3.164','05030101','产二门诊','10018','滕振娟'
74	76	//exec usp_mzhs_hsfzinterface '1','192.168.1.219','2052','儿科门诊','00','supervisor','D8-9E-F3-13-A5-86','0',@sex='男'
75		- cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?,?,?,?,?)}");
76		- cs.setString(1, "1");
77		- cs.setString(2, "200.200.3.53");
78		- cs.setString(3, "0501");
79		- cs.setString(4, "产二门诊");
80		- cs.setString(5, "10120");
81		- cs.setString(6, "李文学");
82		-//
83		-// cs.setString(2, ip);
84		-// cs.setString(3, code);
85		-// cs.setString(4, deptName);
86		-// cs.setString(5, doctorAccount);
87		-// cs.setString(6, doctorName);
	77	+ cs = conn.prepareCall("{call usp_hzfz_hsfzinterface(?,?,?,?,?,?)}");
	78	+ cs.setString(2, ip);
	79	+ cs.setString(3, code);
	80	+ cs.setString(4, deptName);
	81	+ cs.setString(5, doctorAccount);
	82	+ cs.setString(6, doctorName);
88	83	cs.execute();
89	84	ResultSet rs = cs.getResultSet();
90	85
...	...	@@ -114,9 +109,7 @@
114	109	ConnTools.close(conn,cs);
115	110	}
116	111	result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
117		- result.setErrormsg("登陆异常");
118		-
119		- VirtualUtil.sendVoice("登陆成功");
	112	+ result.setErrormsg("登陆失败");
120	113	return result;
121	114	}
122	115
123	116
...	...	@@ -132,9 +125,9 @@
132	125	conn = makeHisConnection();
133	126	//5 退出登录
134	127	//exec usp_mzhs_hsfzinterface 5,'192.168.1.219'
135		- cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}");
	128	+ cs = conn.prepareCall("{call usp_hzfz_hsfzinterface(?,?)}");
136	129	cs.setString(1, "5");
137		- cs.setString(2, "200.200.3.53");
	130	+ cs.setString(2, ip);
138	131	cs.execute();
139	132	ResultSet rs = cs.getResultSet();
140	133
141	134
...	...	@@ -181,10 +174,10 @@
181	174	conn = makeHisConnection();
182	175	//14 更改诊间状态 --0 修改当前诊间为停诊，1 修改当前诊间为开诊，2 获取当前诊间状态(0 停诊 1 开诊)
183	176	//exec usp_mzhs_hsfzinterface_km 14,'192.16.1.111',@zjzt=2
184		- cs = conn.prepareCall("{call usp_mzhs_hsfzinterface_km(?,?,?)}");
	177	+ cs = conn.prepareCall("{call usp_hzfz_hsfzinterface(?,?,@zjzt=?)}");
185	178	cs.setString(1, "14");
186		- cs.setString(2, "200.200.3.53");
187		- cs.setString(3, "@zjzt=" + status);
	179	+ cs.setString(2, ip);
	180	+ cs.setString(3, status);
188	181	cs.execute();
189	182	ResultSet rs = cs.getResultSet();
190	183
191	184
192	185
...	...	@@ -228,11 +221,14 @@
228	221	conn = makeHisConnection();
229	222	// 7 复呼
230	223	// exec usp_mzhs_hsfzinterface 7,'10.58.99.246',@ghxh=2795541
231		- cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?,?)}");
	224	+ cs = conn.prepareCall("{call usp_hzfz_hsfzinterface(?,?,@ghxh=?)}");
232	225	cs.setString(1, "7");
233		- cs.setString(2, "200.200.3.53");
234		- cs.setString(3, "@ghxh=18441");
	226	+ cs.setString(2, ip);
	227	+ cs.setString(3, patientId);
235	228	cs.execute();
	229	+ StringBuffer content = new StringBuffer();
	230	+ content.append("请");
	231	+ boolean isSuccess = false;
236	232	ResultSet rs = cs.getResultSet();
237	233	int count = rs.getMetaData().getColumnCount();
238	234	while (rs.next()) {
239	235
240	236
...	...	@@ -241,15 +237,27 @@
241	237	String columnName = rs.getMetaData().getColumnName(i);
242	238	Object value = rs.getObject(columnName);
243	239	System.out.println(ip+";rebackCall columName=" + columnName+ ";value="+value);
244		- if (columnName != null && "GHXH".equals(String.valueOf(columnName)))
245		- {
246		- result.setErrorcode(ErrorCodeConstants.SUCCESS);
247		- result.setErrormsg("登陆成功");
248		- return result;
249		- }
	240	+ }
250	241
	242	+ String hzxm = rs.getString("HZXM");
	243	+ if (StringUtils.isNotEmpty(hzxm))
	244	+ {
	245	+ isSuccess = true;
	246	+ content.append(hzxm);
	247	+ content.append("到");
	248	+ content.append(rs.getString("ZJMC"));
	249	+ content.append("就诊");
251	250	}
252	251	}
	252	+ if (isSuccess)
	253	+ {
	254	+ System.out.println("复呼内容:"+content.toString());
	255	+ VirtualUtil.sendVoice(content.toString());
	256	+ result.setErrorcode(ErrorCodeConstants.SUCCESS);
	257	+ result.setErrormsg("复呼成功");
	258	+ return result;
	259	+ }
	260	+
253	261	}
254	262	catch (Exception e)
255	263	{
...	...	@@ -260,7 +268,7 @@
260	268	ConnTools.close(conn,cs);
261	269	}
262	270	result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
263		- result.setErrormsg("复呼异常");
	271	+ result.setErrormsg("复呼失败");
264	272	return result;
265	273	}
266	274
...	...	@@ -273,7 +281,7 @@
273	281	Departments departments = departmentsService.getDepartments(user.getDeptId());
274	282
275	283	String code = departments.getShortCode();
276		- String doctorAccount = user.getAccount();
	284	+ String doctorAccount = user.getRemarks();
277	285
278	286	String ip = getIp(request);
279	287	System.out.println("waitPatientList time=" + DateUtil.getyyyy_MM_dd_hms(new Date()) + ";ip=" + ip);
280	288
...	...	@@ -286,11 +294,11 @@
286	294	conn = makeHisConnection();
287	295	//6 获取队列列表
288	296	//exec usp_mzhs_hsfzinterface 6,'192.168.1.219',@ksdm='2052',@ysdm='00'
289		- cs = conn.prepareCall("{call usp_mzhs_hsfzinterface_km(?,?,?,?)}");
	297	+ cs = conn.prepareCall("{call usp_hzfz_hsfzinterface(?,?,@ksdm=?,@ysdm=?)}");
290	298	cs.setString(1, "6");
291		- cs.setString(2, "200.200.3.53");
292		- cs.setString(3, "@ksdm=0501");
293		- cs.setString(4, "@ysdm=10120");
	299	+ cs.setString(2, ip);
	300	+ cs.setString(3, code);
	301	+ cs.setString(4, doctorAccount);
294	302	cs.execute();
295	303	ResultSet rs = cs.getResultSet();
296	304
297	305
...	...	@@ -307,9 +315,9 @@
307	315	{
308	316	Map<String,String> map = new HashMap<>();
309	317	map.put("patientId",rs.getString("GHXH"));
310		- map.put("vcCardNo",rs.getString("GHHX"));
	318	+ map.put("vcCardNo", rs.getString("CARDNO"));
311	319	map.put("name", rs.getString("HZXM"));
312		- map.put("time", rs.getString("ZJDLXH"));
	320	+ map.put("time", formatDate(rs.getString("JLRQ")));
313	321	datas.add(map);
314	322	}
315	323	}
...	...	@@ -331,8 +339,6 @@
331	339	result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
332	340	result.setErrormsg("获取候诊队列失败");
333	341	return result;
334		-
335		-
336	342	}
337	343
338	344
339	345
...	...	@@ -369,9 +375,9 @@
369	375	conn = makeHisConnection();
370	376	//16 已叫号病人列表
371	377	//exec usp_mzhs_hsfzinterface 16,'192.168.1.219'
372		- cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}");
	378	+ cs = conn.prepareCall("{call usp_hzfz_hsfzinterface(?,?)}");
373	379	cs.setString(1, "16");
374		- cs.setString(2, "200.200.3.53");
	380	+ cs.setString(2, ip);
375	381	cs.execute();
376	382	ResultSet rs = cs.getResultSet();
377	383
378	384
...	...	@@ -386,9 +392,9 @@
386	392	if (isExistColumn(rs,"GHXH")) {
387	393	Map<String, String> map = new HashMap<>();
388	394	map.put("patientId", rs.getString("GHXH"));
389		- map.put("vcCardNo", rs.getString("GHHX"));
	395	+ map.put("vcCardNo", rs.getString("CARDNO"));
390	396	map.put("name", rs.getString("HZXM"));
391		- map.put("time", rs.getString("ZJDLXH"));
	397	+ map.put("time", formatDate(rs.getString("JLRQ")));
392	398	datas.add(map);
393	399	}
394	400	}
395	401
396	402
397	403
...	...	@@ -423,20 +429,35 @@
423	429	//exec usp_mzhs_hsfzinterface '2','192.168.1.219'
424	430	cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}");
425	431	cs.setString(1, "2");
426		- cs.setString(2, "200.200.3.53");
	432	+ cs.setString(2, ip);
427	433	cs.execute();
428	434	ResultSet rs = cs.getResultSet();
429	435	int count = rs.getMetaData().getColumnCount();
430		- String content = "";
	436	+ StringBuffer content = new StringBuffer();
	437	+ content.append("请");
	438	+ boolean isSuccess = false;
431	439	while (rs.next()) {
432	440	for (int i = 1; i <= count; i++) {
433	441	String columnName = rs.getMetaData().getColumnName(i);
434	442	Object value = rs.getObject(columnName);
435	443	System.out.println("nextPatient columName=" + columnName + ";value=" + value);
436	444	}
	445	+ String hzxm = rs.getString("HZXM");
	446	+ if (StringUtils.isNotEmpty(hzxm))
	447	+ {
	448	+ isSuccess = true;
	449	+ content.append(hzxm);
	450	+ content.append("到");
	451	+ content.append(rs.getString("ZJMC"));
	452	+ content.append("就诊");
	453	+ }
437	454	}
438		- VirtualUtil.sendVoice(content);
439		- return true;
	455	+ if (isSuccess)
	456	+ {
	457	+ System.out.println("下一个内容:"+content.toString());
	458	+ VirtualUtil.sendVoice(content.toString());
	459	+ return true;
	460	+ }
440	461	}
441	462	catch (Exception e)
442	463	{
...	...	@@ -497,6 +518,24 @@
497	518	e.printStackTrace(System.out);
498	519	}
499	520	return macAddress;
	521	+ }
	522	+
	523	+
	524	+ private String formatDate(String time)
	525	+ {
	526	+ if (!StringUtils.isNotEmpty(time))
	527	+ {
	528	+ return "";
	529	+ }
	530	+ SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHH:mm:ss");
	531	+ SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
	532	+ try {
	533	+ Date date = format.parse(time);
	534	+ return format1.format(date);
	535	+ } catch (ParseException e) {
	536	+ System.out.println(time+"解析时间格式出错"+e);
	537	+ return "";
	538	+ }
500	539	}
501	540
502	541

...	...	@@ -590,9 +590,22 @@
590	590	@ResponseBody
591	591	@TokenRequired
592	592	public BaseObjectResponse findMatDeliverPrint(@RequestParam(required = true) String id,@RequestParam(required = true) String babyId) {
593		- return viewFacade.findMatDeliverPrint(id,babyId);
	593	+ return viewFacade.findMatDeliverPrint(id, babyId);
594	594	}
595	595
	596	+
	597	+ /**
	598	+ * 威海妇幼孕妇建档套打接口
	599	+ *
	600	+ * @param id 孕妇ID
	601	+ * @return
	602	+ */
	603	+ @RequestMapping(value = "/getWhfyPatientPrint", method = RequestMethod.GET)
	604	+ @ResponseBody
	605	+ @TokenRequired
	606	+ public BaseObjectResponse getWhfyPatientPrint(@RequestParam("id") String id) {
	607	+ return viewFacade.getWhfyPatientPrint(id);
	608	+ }
596	609
597	610	}

...	...	@@ -3955,5 +3955,71 @@
3955	3955	br.setData(map);
3956	3956	return br;
3957	3957	}
	3958	+
	3959	+ public BaseObjectResponse getWhfyPatientPrint(String id) {
	3960	+ BaseObjectResponse br = new BaseObjectResponse();
	3961	+ if (org.apache.commons.lang.StringUtils.isEmpty(id)) {
	3962	+ br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
	3963	+ br.setErrormsg("id为空");
	3964	+ return br;
	3965	+ }
	3966	+
	3967	+ Patients data = patientsService.findOnePatientById(id);
	3968	+ if (data == null \|\| data.getYn() == YnEnums.NO.getId()) {
	3969	+ br.setErrorcode(ErrorCodeConstants.NO_DATA);
	3970	+ br.setErrormsg("没有查询到数据");
	3971	+ return br;
	3972	+ }
	3973	+
	3974	+ Map<String, Object> map = new HashMap<>();
	3975	+
	3976	+ map.put("id", data.getId());
	3977	+ /* 孕妇基础数据 */
	3978	+ map.put("username", data.getUsername());
	3979	+ map.put("age", DateUtil.getAge(data.getBirth()));
	3980	+ map.put("nation", getBasicConfig(data.getPnationId()));
	3981	+
	3982	+ map.put("professionType", getBasicConfig(data.getPprofessionTypeId()));
	3983	+ map.put("workUnit", data.getPworkUnit());
	3984	+ map.put("phone", data.getPhone());
	3985	+ map.put("cardNo", data.getCardNo());
	3986	+
	3987	+
	3988	+ /* 孕妇联系方式 */
	3989	+ map.put("residence", CommonsHelper.getResidence(data.getProvinceId(), data.getCityId(),
	3990	+ data.getAreaId(), data.getStreetId(), data.getAddress(), basicConfigService));
	3991	+ map.put("register", CommonsHelper.getResidence(data.getProvinceRegisterId(), data.getCityRegisterId(),
	3992	+ data.getAreaRegisterId(), data.getStreetRegisterId(), data.getAddressRegister(), basicConfigService));
	3993	+ map.put("postRest", CommonsHelper.getResidence(data.getProvincePostRestId(), data.getCityPostRestId(),
	3994	+ data.getAreaPostRestId(), data.getStreetPostRestId(), data.getAddressPostRest(), basicConfigService));
	3995	+
	3996	+ /* 丈夫信息 */
	3997	+ map.put("husbandName", data.getHusbandName());
	3998	+ String fage = "";
	3999	+ if (StringUtils.isNotEmpty(data.getHcertificateTypeId()) && StringUtils.isNotEmpty(data.getHcertificateNum()) &&
	4000	+ data.getHcertificateNum().length() == 18 &&
	4001	+ "70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(data.getHcertificateTypeId()))
	4002	+ {
	4003	+ String cardNo = data.getHcertificateNum().substring(6, 14);
	4004	+ Date date = DateUtil.parseYYYYMMDD(cardNo);
	4005	+ Integer age = DateUtil.getAge(date);
	4006	+ fage = String.valueOf(age);
	4007	+ }
	4008	+
	4009	+ //丈夫年龄
	4010	+ map.put("husbandAge",fage);
	4011	+ map.put("husbandNation", getBasicConfig(data.getHnationId()));
	4012	+ map.put("husbandProfessionType", getBasicConfig(data.getHprofessionTypeId()));
	4013	+ map.put("husbandRegister", CommonsHelper.getResidence(data.getHprovinceRegisterId(), data.getHcityRegisterId(),
	4014	+ data.getHareaRegisterId(), data.getHstreetRegisterId(), data.getHaddressRegister(),
	4015	+ basicConfigService));
	4016	+ map.put("husbandCardNo", data.getHcertificateNum());
	4017	+ map.put("husbandPhone", data.getHusbandPhone());
	4018	+
	4019	+ br.setData(map);
	4020	+ br.setErrorcode(ErrorCodeConstants.SUCCESS);
	4021	+ br.setErrormsg("成功");
	4022	+ return br;
	4023	+ }
3958	4024	}