jiangjiazhi / regional-platform

Commit 713b9547c739e3473afaa3443c7647d5258c1757

Authored by liquanyu almost 8 years ago

Exists in master and in 6 other branches

虚拟叫号

Showing 3 changed files with 93 additions and 34 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/whfy/VirtualCallService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java

...	...	@@ -399,6 +399,22 @@
399	399	}
400	400	}
401	401
	402	+
	403	+ public static Date parseYYYYMMDD(String s) {
	404	+ if (s == null) {
	405	+ return null;
	406	+ }
	407	+
	408	+ try {
	409	+ lock.lock();
	410	+ return ymd.parse(s);
	411	+ } catch (Exception e) {
	412	+ return null;
	413	+ }finally {
	414	+ lock.unlock();
	415	+ }
	416	+ }
	417	+
402	418	public static Date parseYMDEnd(String s) {
403	419	if (s == null) {
404	420	return null;

...	...	@@ -73,11 +73,17 @@
73	73	//exec usp_mzhs_hsfzinterface '1','192.168.1.219','2052','儿科门诊','00','supervisor','D8-9E-F3-13-A5-86','0',@sex='男'
74	74	cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?,?,?,?,?)}");
75	75	cs.setString(1, "1");
76		- cs.setString(2, ip);
77		- cs.setString(3, code);
78		- cs.setString(4, deptName);
79		- cs.setString(5, doctorAccount);
80		- cs.setString(6, doctorName);
	76	+ cs.setString(2, "200.200.3.53");
	77	+ cs.setString(3, "050301");
	78	+ cs.setString(4, "产二门诊");
	79	+ cs.setString(5, "0258");
	80	+ cs.setString(6, "宋晓辉");
	81	+//
	82	+// cs.setString(2, ip);
	83	+// cs.setString(3, code);
	84	+// cs.setString(4, deptName);
	85	+// cs.setString(5, doctorAccount);
	86	+// cs.setString(6, doctorName);
81	87	cs.execute();
82	88	ResultSet rs = cs.getResultSet();
83	89
...	...	@@ -125,7 +131,7 @@
125	131	//exec usp_mzhs_hsfzinterface 5,'192.168.1.219'
126	132	cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}");
127	133	cs.setString(1, "5");
128		- cs.setString(2, ip);
	134	+ cs.setString(2, "200.200.3.53");
129	135	cs.execute();
130	136	ResultSet rs = cs.getResultSet();
131	137
...	...	@@ -174,7 +180,7 @@
174	180	//exec usp_mzhs_hsfzinterface_km 14,'192.16.1.111',@zjzt=2
175	181	cs = conn.prepareCall("{call usp_mzhs_hsfzinterface_km(?,?,?)}");
176	182	cs.setString(1, "14");
177		- cs.setString(2, ip);
	183	+ cs.setString(2, "200.200.3.53");
178	184	cs.setString(3, "@zjzt=" + status);
179	185	cs.execute();
180	186	ResultSet rs = cs.getResultSet();
...	...	@@ -189,7 +195,7 @@
189	195	if (value != null && "T".equals(String.valueOf(value)))
190	196	{
191	197	result.setErrorcode(ErrorCodeConstants.SUCCESS);
192		- result.setErrormsg("登陆成功");
	198	+ result.setErrormsg("工作状态修改成功");
193	199	return result;
194	200	}
195	201	}
...	...	@@ -211,7 +217,7 @@
211	217
212	218	BaseResponse result = new BaseResponse();
213	219	String ip = getIp(request);
214		- System.out.println("time="+ DateUtil.getyyyy_MM_dd_hms(new Date())+";ip="+ip);
	220	+ System.out.println("time="+ DateUtil.getyyyy_MM_dd_hms(new Date())+";ip="+ip+";patientId="+patientId);
215	221
216	222	Connection conn = null;
217	223	CallableStatement cs = null;
...	...	@@ -221,7 +227,7 @@
221	227	// exec usp_mzhs_hsfzinterface 7,'10.58.99.246',@ghxh=2795541
222	228	cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?,?)}");
223	229	cs.setString(1, "7");
224		- cs.setString(2, ip);
	230	+ cs.setString(2, "200.200.3.53");
225	231	cs.setString(3, "@ghxh=" + patientId);
226	232	cs.execute();
227	233	ResultSet rs = cs.getResultSet();
228	234
229	235
...	...	@@ -280,17 +286,18 @@
280	286	//exec usp_mzhs_hsfzinterface 6,'192.168.1.219',@ksdm='2052',@ysdm='00'
281	287	cs = conn.prepareCall("{call usp_mzhs_hsfzinterface_km(?,?,?,?)}");
282	288	cs.setString(1, "6");
283		- cs.setString(2, ip);
284		- cs.setString(3, "@ksdm="+code);
285		- cs.setString(4, "@ysdm=" + doctorAccount);
	289	+ cs.setString(2, "200.200.3.53");
	290	+ cs.setString(3, "@ksdm=050301");
	291	+ cs.setString(4, "@ysdm=0258");
286	292	cs.execute();
287	293	ResultSet rs = cs.getResultSet();
288	294
289	295	int count = rs.getMetaData().getColumnCount();
290		- boolean isSuccess = false;
	296	+ boolean isSuccess = true;
291	297	while (rs.next()) {
292	298	for (int i = 1; i <= count; i++)
293	299	{
	300	+ isSuccess = false;
294	301	String columnName = rs.getMetaData().getColumnName(i);
295	302	Object value = rs.getObject(columnName);
296	303	System.out.println(ip+"waitPatientList columName=" + columnName+ ";value="+value);
297	304
...	...	@@ -298,15 +305,16 @@
298	305	{
299	306	isSuccess = true;
300	307	}
301		-
302	308	}
303		- Map<String,String> map = new HashMap<>();
304		- map.put("patientId",rs.getString("GHXH"));
305		- map.put("vcCardNo",rs.getString("CARDNO"));
306		- map.put("name", rs.getString("HZXM"));
307		- map.put("time", rs.getString("JLRQ"));
308		- map.put("gender", "");
309		- datas.add(map);
	309	+ if (isExistColumn(rs,"GHXH"))
	310	+ {
	311	+ Map<String,String> map = new HashMap<>();
	312	+ map.put("patientId",rs.getString("GHXH"));
	313	+ map.put("vcCardNo",rs.getString("CARDNO"));
	314	+ map.put("name", rs.getString("HZXM"));
	315	+ map.put("time", rs.getString("JLRQ"));
	316	+ datas.add(map);
	317	+ }
310	318	}
311	319
312	320	if (isSuccess)
...	...	@@ -334,6 +342,19 @@
334	342	}
335	343
336	344
	345	+ public boolean isExistColumn(ResultSet rs, String columnName) {
	346	+ try {
	347	+ if (rs.findColumn(columnName) > 0 ) {
	348	+ return true;
	349	+ }
	350	+ }
	351	+ catch (SQLException e) {
	352	+ return false;
	353	+ }
	354	+
	355	+ return false;
	356	+ }
	357	+
337	358	public BaseResponse callPatients(HttpServletRequest request, Integer userId, String patientId) {
338	359
339	360	BaseObjectResponse result = new BaseObjectResponse();
340	361
341	362
...	...	@@ -353,15 +374,16 @@
353	374	//exec usp_mzhs_hsfzinterface 16,'192.168.1.219'
354	375	cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}");
355	376	cs.setString(1, "16");
356		- cs.setString(2, ip);
	377	+ cs.setString(2, "200.200.3.53");
357	378	cs.execute();
358	379	ResultSet rs = cs.getResultSet();
359	380
360	381	int count = rs.getMetaData().getColumnCount();
361		- boolean isSuccess = false;
	382	+ boolean isSuccess = true;
362	383	while (rs.next()) {
363	384	for (int i = 1; i <= count; i++)
364	385	{
	386	+ isSuccess = false;
365	387	String columnName = rs.getMetaData().getColumnName(i);
366	388	Object value = rs.getObject(columnName);
367	389	System.out.println("callPatients columName=" + columnName+ ";value="+value);
...	...	@@ -372,13 +394,14 @@
372	394	}
373	395
374	396	}
375		- Map<String,String> map = new HashMap<>();
376		- map.put("patientId",rs.getString("GHXH"));
377		- map.put("vcCardNo",rs.getString("CARDNO"));
378		- map.put("name", rs.getString("HZXM"));
379		- map.put("time", rs.getString("JLRQ"));
380		- map.put("gender", "");
381		- datas.add(map);
	397	+ if (isExistColumn(rs,"GHXH")) {
	398	+ Map<String, String> map = new HashMap<>();
	399	+ map.put("patientId", rs.getString("GHXH"));
	400	+ map.put("vcCardNo", rs.getString("CARDNO"));
	401	+ map.put("name", rs.getString("HZXM"));
	402	+ map.put("time", rs.getString("JLRQ"));
	403	+ datas.add(map);
	404	+ }
382	405	}
383	406
384	407	if (isSuccess)
...	...	@@ -416,7 +439,7 @@
416	439	//exec usp_mzhs_hsfzinterface '2','192.168.1.219'
417	440	cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}");
418	441	cs.setString(1, "2");
419		- cs.setString(2, ip);
	442	+ cs.setString(2, "200.200.3.53");
420	443	cs.execute();
421	444	return true;
422	445	}

...	...	@@ -3903,8 +3903,8 @@
3903	3903	String qfDate = DateUtil.getYmd(new Date());
3904	3904	//签发日期
3905	3905	map.put("signDateYear", qfDate.substring(0,4));
3906		- map.put("signDateMonth", qfDate.substring(4,6));
3907		- map.put("signDateDay", qfDate.substring(6,8));
	3906	+ map.put("signDateMonth", qfDate.substring(4, 6));
	3907	+ map.put("signDateDay", qfDate.substring(6, 8));
3908	3908
3909	3909	//母亲国籍
3910	3910	map.put("motherCountry", getBasicConfig(patients.getPcountryId()));
...	...	@@ -3914,6 +3914,26 @@
3914	3914
3915	3915	//家庭住址
3916	3916	map.put("homeAddress", liveAddress);
	3917	+
	3918	+
	3919	+ //父亲国籍
	3920	+ map.put("fatherCountry", getBasicConfig(patients.getHcountryId()));
	3921	+
	3922	+ //父亲民族
	3923	+ map.put("fatherNation", getBasicConfig(patients.getHnationId()));
	3924	+
	3925	+ String fage = "";
	3926	+ if (StringUtils.isNotEmpty(patients.getHcertificateTypeId()) && patients.getHcertificateNum().length() == 18 &&
	3927	+ "70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(patients.getHcertificateTypeId()))
	3928	+ {
	3929	+ String cardNo = patients.getHcertificateNum().substring(6, 14);
	3930	+ Date date = DateUtil.parseYYYYMMDD(cardNo);
	3931	+ Integer age = DateUtil.getAge(date);
	3932	+ fage = String.valueOf(age);
	3933	+ }
	3934	+
	3935	+ //父亲年龄
	3936	+ map.put("fatherAge",fage);
3917	3937
3918	3938	br.setErrorcode(ErrorCodeConstants.SUCCESS);
3919	3939	br.setErrormsg("成功");