From 713b9547c739e3473afaa3443c7647d5258c1757 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 12 Dec 2017 11:59:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=8F=AB=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/common/utils/DateUtil.java | 16 ++++ .../lyms/hospitalapi/whfy/VirtualCallService.java | 87 ++++++++++++++-------- .../platform/operate/web/facade/ViewFacade.java | 24 +++++- 3 files changed, 93 insertions(+), 34 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 429f6cc..068d43f 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -399,6 +399,22 @@ public class DateUtil { } } + + public static Date parseYYYYMMDD(String s) { + if (s == null) { + return null; + } + + try { + lock.lock(); + return ymd.parse(s); + } catch (Exception e) { + return null; + }finally { + lock.unlock(); + } + } + public static Date parseYMDEnd(String s) { if (s == null) { return null; diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/whfy/VirtualCallService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/whfy/VirtualCallService.java index 9eb16b8..b42d502 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/whfy/VirtualCallService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/whfy/VirtualCallService.java @@ -73,11 +73,17 @@ public class VirtualCallService { //exec usp_mzhs_hsfzinterface '1','192.168.1.219','2052','儿科门诊','00','supervisor','D8-9E-F3-13-A5-86','0',@sex='男' cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?,?,?,?,?)}"); cs.setString(1, "1"); - cs.setString(2, ip); - cs.setString(3, code); - cs.setString(4, deptName); - cs.setString(5, doctorAccount); - cs.setString(6, doctorName); + cs.setString(2, "200.200.3.53"); + cs.setString(3, "050301"); + cs.setString(4, "产二门诊"); + cs.setString(5, "0258"); + cs.setString(6, "宋晓辉"); +// +// cs.setString(2, ip); +// cs.setString(3, code); +// cs.setString(4, deptName); +// cs.setString(5, doctorAccount); +// cs.setString(6, doctorName); cs.execute(); ResultSet rs = cs.getResultSet(); @@ -125,7 +131,7 @@ public class VirtualCallService { //exec usp_mzhs_hsfzinterface 5,'192.168.1.219' cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}"); cs.setString(1, "5"); - cs.setString(2, ip); + cs.setString(2, "200.200.3.53"); cs.execute(); ResultSet rs = cs.getResultSet(); @@ -174,7 +180,7 @@ public class VirtualCallService { //exec usp_mzhs_hsfzinterface_km 14,'192.16.1.111',@zjzt=2 cs = conn.prepareCall("{call usp_mzhs_hsfzinterface_km(?,?,?)}"); cs.setString(1, "14"); - cs.setString(2, ip); + cs.setString(2, "200.200.3.53"); cs.setString(3, "@zjzt=" + status); cs.execute(); ResultSet rs = cs.getResultSet(); @@ -189,7 +195,7 @@ public class VirtualCallService { if (value != null && "T".equals(String.valueOf(value))) { result.setErrorcode(ErrorCodeConstants.SUCCESS); - result.setErrormsg("登陆成功"); + result.setErrormsg("工作状态修改成功"); return result; } } @@ -211,7 +217,7 @@ public class VirtualCallService { BaseResponse result = new BaseResponse(); String ip = getIp(request); - System.out.println("time="+ DateUtil.getyyyy_MM_dd_hms(new Date())+";ip="+ip); + System.out.println("time="+ DateUtil.getyyyy_MM_dd_hms(new Date())+";ip="+ip+";patientId="+patientId); Connection conn = null; CallableStatement cs = null; @@ -221,7 +227,7 @@ public class VirtualCallService { // exec usp_mzhs_hsfzinterface 7,'10.58.99.246',@ghxh=2795541 cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?,?)}"); cs.setString(1, "7"); - cs.setString(2, ip); + cs.setString(2, "200.200.3.53"); cs.setString(3, "@ghxh=" + patientId); cs.execute(); ResultSet rs = cs.getResultSet(); @@ -280,17 +286,18 @@ public class VirtualCallService { //exec usp_mzhs_hsfzinterface 6,'192.168.1.219',@ksdm='2052',@ysdm='00' cs = conn.prepareCall("{call usp_mzhs_hsfzinterface_km(?,?,?,?)}"); cs.setString(1, "6"); - cs.setString(2, ip); - cs.setString(3, "@ksdm="+code); - cs.setString(4, "@ysdm=" + doctorAccount); + cs.setString(2, "200.200.3.53"); + cs.setString(3, "@ksdm=050301"); + cs.setString(4, "@ysdm=0258"); cs.execute(); ResultSet rs = cs.getResultSet(); int count = rs.getMetaData().getColumnCount(); - boolean isSuccess = false; + boolean isSuccess = true; while (rs.next()) { for (int i = 1; i <= count; i++) { + isSuccess = false; String columnName = rs.getMetaData().getColumnName(i); Object value = rs.getObject(columnName); System.out.println(ip+"waitPatientList columName=" + columnName+ ";value="+value); @@ -298,15 +305,16 @@ public class VirtualCallService { { isSuccess = true; } - } - Map map = new HashMap<>(); - map.put("patientId",rs.getString("GHXH")); - map.put("vcCardNo",rs.getString("CARDNO")); - map.put("name", rs.getString("HZXM")); - map.put("time", rs.getString("JLRQ")); - map.put("gender", ""); - datas.add(map); + if (isExistColumn(rs,"GHXH")) + { + Map map = new HashMap<>(); + map.put("patientId",rs.getString("GHXH")); + map.put("vcCardNo",rs.getString("CARDNO")); + map.put("name", rs.getString("HZXM")); + map.put("time", rs.getString("JLRQ")); + datas.add(map); + } } if (isSuccess) @@ -334,6 +342,19 @@ public class VirtualCallService { } + public boolean isExistColumn(ResultSet rs, String columnName) { + try { + if (rs.findColumn(columnName) > 0 ) { + return true; + } + } + catch (SQLException e) { + return false; + } + + return false; + } + public BaseResponse callPatients(HttpServletRequest request, Integer userId, String patientId) { BaseObjectResponse result = new BaseObjectResponse(); @@ -353,15 +374,16 @@ public class VirtualCallService { //exec usp_mzhs_hsfzinterface 16,'192.168.1.219' cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}"); cs.setString(1, "16"); - cs.setString(2, ip); + cs.setString(2, "200.200.3.53"); cs.execute(); ResultSet rs = cs.getResultSet(); int count = rs.getMetaData().getColumnCount(); - boolean isSuccess = false; + boolean isSuccess = true; while (rs.next()) { for (int i = 1; i <= count; i++) { + isSuccess = false; String columnName = rs.getMetaData().getColumnName(i); Object value = rs.getObject(columnName); System.out.println("callPatients columName=" + columnName+ ";value="+value); @@ -372,13 +394,14 @@ public class VirtualCallService { } } - Map map = new HashMap<>(); - map.put("patientId",rs.getString("GHXH")); - map.put("vcCardNo",rs.getString("CARDNO")); - map.put("name", rs.getString("HZXM")); - map.put("time", rs.getString("JLRQ")); - map.put("gender", ""); - datas.add(map); + if (isExistColumn(rs,"GHXH")) { + Map map = new HashMap<>(); + map.put("patientId", rs.getString("GHXH")); + map.put("vcCardNo", rs.getString("CARDNO")); + map.put("name", rs.getString("HZXM")); + map.put("time", rs.getString("JLRQ")); + datas.add(map); + } } if (isSuccess) @@ -416,7 +439,7 @@ public class VirtualCallService { //exec usp_mzhs_hsfzinterface '2','192.168.1.219' cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}"); cs.setString(1, "2"); - cs.setString(2, ip); + cs.setString(2, "200.200.3.53"); cs.execute(); return true; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 05f7649..4f93d04 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -3903,8 +3903,8 @@ public class ViewFacade { String qfDate = DateUtil.getYmd(new Date()); //签发日期 map.put("signDateYear", qfDate.substring(0,4)); - map.put("signDateMonth", qfDate.substring(4,6)); - map.put("signDateDay", qfDate.substring(6,8)); + map.put("signDateMonth", qfDate.substring(4, 6)); + map.put("signDateDay", qfDate.substring(6, 8)); //母亲国籍 map.put("motherCountry", getBasicConfig(patients.getPcountryId())); @@ -3915,6 +3915,26 @@ public class ViewFacade { //家庭住址 map.put("homeAddress", liveAddress); + + //父亲国籍 + map.put("fatherCountry", getBasicConfig(patients.getHcountryId())); + + //父亲民族 + map.put("fatherNation", getBasicConfig(patients.getHnationId())); + + String fage = ""; + if (StringUtils.isNotEmpty(patients.getHcertificateTypeId()) && patients.getHcertificateNum().length() == 18 && + "70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(patients.getHcertificateTypeId())) + { + String cardNo = patients.getHcertificateNum().substring(6, 14); + Date date = DateUtil.parseYYYYMMDD(cardNo); + Integer age = DateUtil.getAge(date); + fage = String.valueOf(age); + } + + //父亲年龄 + map.put("fatherAge",fage); + br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); br.setData(map); -- 1.8.3.1