Commit 6dbed81401766b33ce90bb02ea9471364824e301

Authored by yangfei

Merge remote-tracking branch 'origin/master'

Showing 12 changed files

platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/ConnTools.java View file @ 6dbed81
  1 +package com.lyms.hospitalapi.lcdcf;
  2 +
  3 +import java.sql.Connection;
  4 +import java.sql.DriverManager;
  5 +import java.sql.SQLException;
  6 +
  7 +/**
  8 + * 聊城东昌府
  9 + */
  10 +public class ConnTools {
  11 + private static String hisDirverClassName = "oracle.jdbc.driver.OracleDriver";
  12 + private static String hisUrl = "jdbc:oracle:thin:@10.2.7.17:1521:ORCL";
  13 + private static String hisUser = "U_LYMS";
  14 + private static String hisPassword = "LYMS_123";
  15 +
  16 + public static Connection makeHisConnection() {
  17 + Connection conn = null;
  18 + try {
  19 + Class.forName(hisDirverClassName);
  20 + } catch (ClassNotFoundException e) {
  21 + e.printStackTrace();
  22 + }
  23 + try {
  24 + conn = DriverManager.getConnection(hisUrl, hisUser, hisPassword);
  25 + } catch (SQLException e) {
  26 + e.printStackTrace();
  27 + }
  28 + return conn;
  29 + }
  30 +}
platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/HisCheckItems.java View file @ 6dbed81
  1 +package com.lyms.hospitalapi.lcdcf;
  2 +
  3 +/**
  4 + * Created by Administrator on 2017-12-08.
  5 + */
  6 +public class HisCheckItems {
  7 +
  8 + private String id;
  9 + private String vcCardNo;
  10 + private String time;
  11 + private String itemId;
  12 +
  13 + public String getId() {
  14 + return id;
  15 + }
  16 +
  17 + public void setId(String id) {
  18 + this.id = id;
  19 + }
  20 +
  21 + public String getVcCardNo() {
  22 + return vcCardNo;
  23 + }
  24 +
  25 + public void setVcCardNo(String vcCardNo) {
  26 + this.vcCardNo = vcCardNo;
  27 + }
  28 +
  29 + public String getTime() {
  30 + return time;
  31 + }
  32 +
  33 + public void setTime(String time) {
  34 + this.time = time;
  35 + }
  36 +
  37 + public String getItemId() {
  38 + return itemId;
  39 + }
  40 +
  41 + public void setItemId(String itemId) {
  42 + this.itemId = itemId;
  43 + }
  44 +}
platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfHisModel.java View file @ 6dbed81
  1 +package com.lyms.hospitalapi.lcdcf;
  2 +
  3 +/**
  4 + * Created by Administrator on 2017-12-08.
  5 + */
  6 +public class LcdcfHisModel {
  7 +
  8 + private String id;
  9 + private String idCard;
  10 + private String phone;
  11 + private String bhnum;
  12 +
  13 + public String getId() {
  14 + return id;
  15 + }
  16 +
  17 + public void setId(String id) {
  18 + this.id = id;
  19 + }
  20 +
  21 + public String getIdCard() {
  22 + return idCard;
  23 + }
  24 +
  25 + public void setIdCard(String idCard) {
  26 + this.idCard = idCard;
  27 + }
  28 +
  29 + public String getPhone() {
  30 + return phone;
  31 + }
  32 +
  33 + public void setPhone(String phone) {
  34 + this.phone = phone;
  35 + }
  36 +
  37 + public String getBhnum() {
  38 + return bhnum;
  39 + }
  40 +
  41 + public void setBhnum(String bhnum) {
  42 + this.bhnum = bhnum;
  43 + }
  44 +}
platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfHisService.java View file @ 6dbed81
  1 +package com.lyms.hospitalapi.lcdcf;
  2 +
  3 +import com.lyms.platform.common.utils.DateUtil;
  4 +import org.apache.commons.collections.CollectionUtils;
  5 +import org.apache.commons.dbutils.DbUtils;
  6 +import org.apache.commons.dbutils.QueryRunner;
  7 +import org.apache.commons.dbutils.handlers.BeanListHandler;
  8 +import org.springframework.stereotype.Service;
  9 +
  10 +import java.sql.Connection;
  11 +import java.sql.SQLException;
  12 +import java.util.*;
  13 +
  14 +/**
  15 + * Created by Administrator on 2017-12-05.
  16 + */
  17 +
  18 +@Service("lcdcfHisService")
  19 +public class LcdcfHisService {
  20 +
  21 + /**
  22 + * 通过住院号查询孕妇手机号码和身份证号码
  23 + * @return
  24 + */
  25 + public LcdcfHisModel getHisPatientByZyh(String zyNo)
  26 + {
  27 + String sql = "select id, idcard as idCard , bhnum, phone from v_patientinfo where bhnum='"+zyNo+"'";
  28 + Connection connection = null;
  29 + try {
  30 + connection = ConnTools.makeHisConnection();
  31 + QueryRunner queryRunner = new QueryRunner(true);
  32 + List<LcdcfHisModel> LcdcfHisModels = queryRunner.query(connection,sql,new BeanListHandler<LcdcfHisModel>(LcdcfHisModel.class));
  33 + if(CollectionUtils.isNotEmpty(LcdcfHisModels))
  34 + {
  35 + return LcdcfHisModels.get(0);
  36 + }
  37 + } catch (SQLException e) {
  38 + e.printStackTrace();
  39 + }
  40 + finally
  41 + {
  42 + DbUtils.closeQuietly(connection);
  43 + }
  44 + return null;
  45 + }
  46 +
  47 +
  48 + /**
  49 + * 获取孕妇当天的lis检查项目
  50 + * @param vcCardNo
  51 + * @return
  52 + */
  53 + public List<HisCheckItems> getPatientCheckLisItems(String vcCardNo,String time)
  54 + {
  55 +
  56 + String sql = "select ID as id,就诊卡号 as vcCardNo,医嘱内容 as content,开嘱时间 as time,诊疗项目ID as itemId from v_check_items where 就诊卡号='"+vcCardNo+"' and 开嘱时间 like '"+time+"%'";
  57 + Connection connection = null;
  58 + try {
  59 + connection = ConnTools.makeHisConnection();
  60 + QueryRunner queryRunner = new QueryRunner(true);
  61 + List<HisCheckItems> hisCheckItems = queryRunner.query(connection,sql,new BeanListHandler<HisCheckItems>(HisCheckItems.class));
  62 + if(CollectionUtils.isNotEmpty(hisCheckItems))
  63 + {
  64 + return hisCheckItems;
  65 + }
  66 + } catch (SQLException e) {
  67 + e.printStackTrace();
  68 + }
  69 + finally
  70 + {
  71 + DbUtils.closeQuietly(connection);
  72 + }
  73 + return null;
  74 + }
  75 +
  76 +}
platform-operate-api/src/main/java/com/lyms/hospitalapi/whfy/ConnTools.java View file @ 6dbed81
... ... @@ -14,8 +14,8 @@
14 14 //分诊叫号
15 15 private static String dirverClassName = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
16 16 private static String url = "jdbc:sqlserver://200.200.200.53:1433; DatabaseName=MZHSZ";
17   - private static String user = "123qwe!@#";
18   - private static String password = "sa";
  17 + private static String user = "sa";
  18 + private static String password = "123qwe!@#";
19 19  
20 20 public static Connection makeHisConnection() {
21 21 Connection conn = null;
platform-operate-api/src/main/java/com/lyms/hospitalapi/whfy/VirtualCallService.java View file @ 6dbed81
... ... @@ -5,6 +5,7 @@
5 5 import com.lyms.platform.common.result.BaseResponse;
6 6 import com.lyms.platform.common.utils.DateUtil;
7 7 import com.lyms.platform.common.utils.ExceptionUtils;
  8 +import com.lyms.platform.common.utils.StringUtils;
8 9 import com.lyms.platform.permission.model.Departments;
9 10 import com.lyms.platform.permission.model.Users;
10 11 import com.lyms.platform.permission.service.DepartmentsService;
11 12  
12 13  
13 14  
14 15  
15 16  
16 17  
17 18  
18 19  
19 20  
20 21  
21 22  
22 23  
... ... @@ -51,163 +52,207 @@
51 52  
52 53 String doctorAccount = user.getAccount();
53 54 String doctorName = user.getName();
54   -//
55   -// Enumeration<String> e = request.getHeaderNames();
56   -// while(e.hasMoreElements()){
57   -// String headerName = e.nextElement();
58   -// Enumeration<String> headerValues = request.getHeaders(headerName);
59   -// while(headerValues.hasMoreElements()){
60   -// System.out.println(headerName+":"+headerValues.nextElement());
61   -// }
62   -// }
63 55  
64   - String ip = request.getHeader("x-real-ip");
65   - String mac = getMACAddress(ip);
  56 + //打印头信息
  57 + Enumeration<String> enumeration = request.getHeaderNames();
  58 + while(enumeration.hasMoreElements()){
  59 + String headerName = enumeration.nextElement();
  60 + Enumeration<String> headerValues = request.getHeaders(headerName);
  61 + while(headerValues.hasMoreElements()){
  62 + System.out.println(headerName+":"+headerValues.nextElement());
  63 + }
  64 + }
66 65  
  66 + String ip = getIp(request);
67 67 System.out.println("time="+ DateUtil.getyyyy_MM_dd_hms(new Date())+";code="+code+";deptName="+deptName+";doctorAccount="+doctorAccount+";doctorName="+doctorName
68   - +";ip="+ip+";mac="+mac);
  68 + +";ip="+ip);
69 69  
70   -// Connection conn = null;
71   -// CallableStatement cs = null;
72   -// try {
73   -// conn = makeHisConnection();
74   -// //1.1 普通登录
75   -// //exec usp_mzhs_hsfzinterface '1','192.168.1.219','2052','儿科门诊','00','supervisor','D8-9E-F3-13-A5-86','0',@sex='男'
76   -// cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?,?,?,?,?,?)}");
77   -// cs.setString(1, "1");
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);
83   -// cs.setString(7, mac);
84   -// ResultSet rs = cs.executeQuery();
85   -//
86   -// int count = rs.getMetaData().getColumnCount();
87   -// while (rs.next()) {
88   -// for (int i = 1; i <= count; i++)
89   -// {
90   -// String columnName = rs.getMetaData().getColumnName(i);
91   -// Object obj = rs.getObject(columnName);
92   -// System.out.println("columName=" + columnName+ ";value="+obj);
93   -// }
94   -// }
95   -//
96   -// }
97   -// catch (SQLException e)
98   -// {
99   -// ExceptionUtils.catchException(e, "callLogin exception");
100   -// result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
101   -// result.setErrormsg("登陆异常");
102   -// return result;
103   -// }
104   -// finally {
105   -// ConnTools.close(conn,cs);
106   -// }
  70 + Connection conn = null;
  71 + CallableStatement cs = null;
  72 + try {
  73 + conn = makeHisConnection();
  74 + //1.1 普通登录
  75 + //exec usp_mzhs_hsfzinterface '1','192.168.1.219','2052','儿科门诊','00','supervisor','D8-9E-F3-13-A5-86','0',@sex='男'
  76 + cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?,?,?,?,?)}");
  77 + cs.setString(1, "1");
  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);
  83 + ResultSet rs = cs.executeQuery();
107 84  
108   - result.setErrorcode(ErrorCodeConstants.SUCCESS);
109   - result.setErrormsg("登陆成功");
  85 + int count = rs.getMetaData().getColumnCount();
  86 + while (rs.next()) {
  87 + for (int i = 1; i <= count; i++)
  88 + {
  89 + String columnName = rs.getMetaData().getColumnName(i);
  90 + Object obj = rs.getObject(columnName);
  91 + System.out.println("callLogin columName=" + columnName+ ";value="+obj);
  92 + }
  93 + String isSuccess = rs.getString("STATUS");
  94 + if (StringUtils.isNotEmpty(isSuccess) && "T".equals(isSuccess))
  95 + {
  96 + result.setErrorcode(ErrorCodeConstants.SUCCESS);
  97 + result.setErrormsg("登陆成功");
  98 + return result;
  99 + }
  100 + }
  101 + }
  102 + catch (Exception e)
  103 + {
  104 + ExceptionUtils.catchException(e, "callLogin exception");
  105 +
  106 + }
  107 + finally {
  108 + ConnTools.close(conn,cs);
  109 + }
  110 + result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
  111 + result.setErrormsg("登陆异常");
110 112 return result;
111 113 }
112 114  
113 115 public BaseResponse callLoginOut(HttpServletRequest request, Integer userId) {
114 116  
115 117 BaseResponse result = new BaseResponse();
116   - String ip = request.getHeader("X-Real-IP");
  118 + String ip = getIp(request);
117 119 System.out.println("time="+ DateUtil.getyyyy_MM_dd_hms(new Date())+";ip="+ip);
118 120  
119   -// Connection conn = null;
120   -// CallableStatement cs = null;
121   -// try {
122   -// conn = makeHisConnection();
123   -// //5 退出登录
124   -// //exec usp_mzhs_hsfzinterface 5,'192.168.1.219'
125   -// cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}");
126   -// cs.setString(1, "5");
127   -// cs.setString(2, ip);
128   -// ResultSet rs = cs.executeQuery();
129   -// }
130   -// catch (SQLException e)
131   -// {
132   -// ExceptionUtils.catchException(e, "callLoginOut exception");
133   -// result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
134   -// result.setErrormsg("登出异常");
135   -// return result;
136   -// }
137   -// finally {
138   -// ConnTools.close(conn,cs);
139   -// }
140   - result.setErrorcode(ErrorCodeConstants.SUCCESS);
141   - result.setErrormsg("登出成功");
142   - return result;
  121 + Connection conn = null;
  122 + CallableStatement cs = null;
  123 + try {
  124 + conn = makeHisConnection();
  125 + //5 退出登录
  126 + //exec usp_mzhs_hsfzinterface 5,'192.168.1.219'
  127 + cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}");
  128 + cs.setString(1, "5");
  129 + cs.setString(2, ip);
  130 + ResultSet rs = cs.executeQuery();
143 131  
  132 + int count = rs.getMetaData().getColumnCount();
  133 + while (rs.next()) {
  134 + for (int i = 1; i <= count; i++)
  135 + {
  136 + String columnName = rs.getMetaData().getColumnName(i);
  137 + Object obj = rs.getObject(columnName);
  138 + System.out.println("callLoginOut columName=" + columnName+ ";value="+obj);
  139 + }
  140 + String isSuccess = rs.getString("STATUS");
  141 + if (StringUtils.isNotEmpty(isSuccess) && "T".equals(isSuccess))
  142 + {
  143 + result.setErrorcode(ErrorCodeConstants.SUCCESS);
  144 + result.setErrormsg("登出成功");
  145 + return result;
  146 + }
  147 + }
  148 +
  149 + }
  150 + catch (Exception e)
  151 + {
  152 + ExceptionUtils.catchException(e, "callLoginOut exception");
  153 + }
  154 + finally
  155 + {
  156 + ConnTools.close(conn,cs);
  157 + }
  158 + result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
  159 + result.setErrormsg("登出异常");
  160 + return result;
144 161 }
145 162  
146 163 public BaseResponse doWorkStatusChange(HttpServletRequest request, Integer userId, String status) {
147 164  
148 165 BaseResponse result = new BaseResponse();
149   - String ip = request.getRemoteAddr();
  166 + String ip = getIp(request);
150 167 System.out.println("time="+ DateUtil.getyyyy_MM_dd_hms(new Date())+";ip="+ip);
151 168  
152   -// Connection conn = null;
153   -// CallableStatement cs = null;
154   -// try {
155   -// conn = makeHisConnection();
156   -// //14 更改诊间状态 --0 修改当前诊间为停诊,1 修改当前诊间为开诊,2 获取当前诊间状态(0 停诊 1 开诊)
157   -// //exec usp_mzhs_hsfzinterface_km 14,'192.16.1.111',@zjzt=2
158   -// cs = conn.prepareCall("{call usp_mzhs_hsfzinterface_km(?,?,?)}");
159   -// cs.setString(1, "14");
160   -// cs.setString(2, ip);
161   -// cs.setString(3, "@zjzt=" + status);
162   -// ResultSet rs = cs.executeQuery();
163   -// }
164   -// catch (SQLException e)
165   -// {
166   -// ExceptionUtils.catchException(e, "doWorkStatusChange exception");
167   -// result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
168   -// result.setErrormsg("工作状态修改异常");
169   -// return result;
170   -// }
171   -// finally {
172   -// ConnTools.close(conn,cs);
173   -// }
174   - result.setErrorcode(ErrorCodeConstants.SUCCESS);
175   - result.setErrormsg("工作状态修改成功");
176   - return result;
  169 + Connection conn = null;
  170 + CallableStatement cs = null;
  171 + try {
  172 + conn = makeHisConnection();
  173 + //14 更改诊间状态 --0 修改当前诊间为停诊,1 修改当前诊间为开诊,2 获取当前诊间状态(0 停诊 1 开诊)
  174 + //exec usp_mzhs_hsfzinterface_km 14,'192.16.1.111',@zjzt=2
  175 + cs = conn.prepareCall("{call usp_mzhs_hsfzinterface_km(?,?,?)}");
  176 + cs.setString(1, "14");
  177 + cs.setString(2, ip);
  178 + cs.setString(3, "@zjzt=" + status);
  179 + ResultSet rs = cs.executeQuery();
  180 +
  181 + int count = rs.getMetaData().getColumnCount();
  182 + while (rs.next()) {
  183 + for (int i = 1; i <= count; i++)
  184 + {
  185 + String columnName = rs.getMetaData().getColumnName(i);
  186 + Object obj = rs.getObject(columnName);
  187 + System.out.println("doWorkStatusChange columName=" + columnName+ ";value="+obj);
  188 + }
  189 + String isSuccess = rs.getString("STATUS");
  190 + if (StringUtils.isNotEmpty(isSuccess) && "T".equals(isSuccess))
  191 + {
  192 + result.setErrorcode(ErrorCodeConstants.SUCCESS);
  193 + result.setErrormsg("工作状态修改成功");
  194 + return result;
  195 + }
  196 + }
  197 + }
  198 + catch (Exception e)
  199 + {
  200 + ExceptionUtils.catchException(e, "doWorkStatusChange exception");
  201 + }
  202 + finally {
  203 + ConnTools.close(conn,cs);
  204 + }
  205 + result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
  206 + result.setErrormsg("工作状态修改异常");
  207 + return result;
177 208 }
178 209  
179 210 public BaseResponse rebackCall(HttpServletRequest request, Integer userId,String patientId) {
180 211  
181 212 BaseResponse result = new BaseResponse();
182   - String ip = request.getRemoteAddr();
  213 + String ip = getIp(request);
183 214 System.out.println("time="+ DateUtil.getyyyy_MM_dd_hms(new Date())+";ip="+ip);
184 215  
185   -// Connection conn = null;
186   -// CallableStatement cs = null;
187   -// try {
188   -// conn = makeHisConnection();
189   -// // 7 复呼
190   -// // exec usp_mzhs_hsfzinterface 7,'10.58.99.246',@ghxh=2795541
191   -// cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?,?)}");
192   -// cs.setString(1, "7");
193   -// cs.setString(2, ip);
194   -// cs.setString(3, "@ghxh=" + patientId);
195   -// ResultSet rs = cs.executeQuery();
196   -// }
197   -// catch (SQLException e)
198   -// {
199   -// ExceptionUtils.catchException(e, "rebackCall exception");
200   -// result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
201   -// result.setErrormsg("复呼异常");
202   -// return result;
203   -// }
204   -// finally
205   -// {
206   -// ConnTools.close(conn,cs);
207   -// }
208   - result.setErrorcode(ErrorCodeConstants.SUCCESS);
209   - result.setErrormsg("复呼成功");
210   - return result;
  216 + Connection conn = null;
  217 + CallableStatement cs = null;
  218 + try {
  219 + conn = makeHisConnection();
  220 + // 7 复呼
  221 + // exec usp_mzhs_hsfzinterface 7,'10.58.99.246',@ghxh=2795541
  222 + cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?,?)}");
  223 + cs.setString(1, "7");
  224 + cs.setString(2, ip);
  225 + cs.setString(3, "@ghxh=" + patientId);
  226 + ResultSet rs = cs.executeQuery();
  227 +
  228 + int count = rs.getMetaData().getColumnCount();
  229 + while (rs.next()) {
  230 + for (int i = 1; i <= count; i++)
  231 + {
  232 + String columnName = rs.getMetaData().getColumnName(i);
  233 + Object obj = rs.getObject(columnName);
  234 + System.out.println("rebackCall columName=" + columnName+ ";value="+obj);
  235 + }
  236 + String isSuccess = rs.getString("STATUS");
  237 + if (StringUtils.isNotEmpty(isSuccess) && "T".equals(isSuccess))
  238 + {
  239 + result.setErrorcode(ErrorCodeConstants.SUCCESS);
  240 + result.setErrormsg("复呼成功");
  241 + return result;
  242 + }
  243 + }
  244 + }
  245 + catch (Exception e)
  246 + {
  247 + ExceptionUtils.catchException(e, "rebackCall exception");
  248 + }
  249 + finally
  250 + {
  251 + ConnTools.close(conn,cs);
  252 + }
  253 + result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
  254 + result.setErrormsg("复呼异常");
  255 + return result;
211 256 }
212 257  
213 258  
214 259  
215 260  
216 261  
217 262  
... ... @@ -221,62 +266,53 @@
221 266 String code = departments.getShortCode();
222 267 String doctorAccount = user.getAccount();
223 268  
224   - String ip = request.getRemoteAddr();
225   - System.out.println("time="+ DateUtil.getyyyy_MM_dd_hms(new Date())+";ip="+ip);
  269 + String ip = getIp(request);
  270 + System.out.println("waitPatientList time="+ DateUtil.getyyyy_MM_dd_hms(new Date())+";ip="+ip);
226 271  
227 272 List<Map<String,String>> datas = new ArrayList<>();
228   - Map<String,String> map = new HashMap<>();
229   - map.put("patientId","11111");
230   - map.put("vcCardNo","1234123");
231   - map.put("name", "张啊");
232   - map.put("time", "11/21 10:22:21");
233   - map.put("gender", "男");
234 273  
  274 + Connection conn = null;
  275 + CallableStatement cs = null;
  276 + try {
  277 + conn = makeHisConnection();
  278 + //6 获取队列列表
  279 + //exec usp_mzhs_hsfzinterface 6,'192.168.1.219',@ksdm='2052',@ysdm='00'
  280 + cs = conn.prepareCall("{call usp_mzhs_hsfzinterface_km(?,?,?,?)}");
  281 + cs.setString(1, "6");
  282 + cs.setString(2, ip);
  283 + cs.setString(3, "@ksdm="+code);
  284 + cs.setString(4, "@ysdm=" + doctorAccount);
  285 + ResultSet rs = cs.executeQuery();
235 286  
236   - Map<String,String> map1 = new HashMap<>();
237   - map1.put("patientId","22222");
238   - map1.put("vcCardNo","2341234");
239   - map1.put("name", "王丹");
240   - map1.put("time", "11/21 10:22:21");
241   - map1.put("gender", "女");
  287 + int count = rs.getMetaData().getColumnCount();
  288 + while (rs.next()) {
  289 + for (int i = 1; i <= count; i++)
  290 + {
  291 + String columnName = rs.getMetaData().getColumnName(i);
  292 + Object obj = rs.getObject(columnName);
  293 + System.out.println("waitPatientList columName=" + columnName+ ";value="+obj);
  294 + }
  295 + Map<String,String> map = new HashMap<>();
  296 + map.put("patientId",rs.getString("GHXH"));
  297 + map.put("vcCardNo",rs.getString("CARDNO"));
  298 + map.put("name", rs.getString("HZXM"));
  299 + map.put("time", rs.getString("JLRQ"));
  300 + map.put("gender", "");
  301 + datas.add(map);
  302 + }
  303 + }
  304 + catch (Exception e)
  305 + {
  306 + ExceptionUtils.catchException(e, "waitPatientList exception");
  307 + result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
  308 + result.setErrormsg("获取候诊队列失败");
  309 + return result;
  310 + }
  311 + finally
  312 + {
  313 + ConnTools.close(conn,cs);
  314 + }
242 315  
243   - datas.add(map);
244   - datas.add(map1);
245   -
246   -
247   -
248   -// Connection conn = null;
249   -// CallableStatement cs = null;
250   -// try {
251   -// conn = makeHisConnection();
252   -// //6 获取队列列表
253   -// //exec usp_mzhs_hsfzinterface 6,'192.168.1.219',@ksdm='2052',@ysdm='00'
254   -// cs = conn.prepareCall("{call usp_mzhs_hsfzinterface_km(?,?,?,?)}");
255   -// cs.setString(1, "6");
256   -// cs.setString(2, ip);
257   -// cs.setString(3, "@ksdm="+code);
258   -// cs.setString(4, "@ysdm=" + doctorAccount);
259   -// ResultSet rs = cs.executeQuery();
260   -// Map<String,String> map = new HashMap<>();
261   -// map.put("卡号","");
262   -// map.put("姓名", "");
263   -// map.put("挂号时间", "");
264   -// map.put("性别", "");
265   -// datas.add(map);
266   -// }
267   -// catch (SQLException e)
268   -// {
269   -// ExceptionUtils.catchException(e, "waitPatientList exception");
270   -// result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
271   -// result.setErrormsg("获取候诊队列失败");
272   -// result.setData(datas);
273   -// return result;
274   -// }
275   -// finally
276   -// {
277   -// ConnTools.close(conn,cs);
278   -// }
279   -
280 316 result.setErrorcode(ErrorCodeConstants.SUCCESS);
281 317 result.setErrormsg("复呼成功");
282 318 result.setData(datas);
283 319  
284 320  
285 321  
286 322  
... ... @@ -288,60 +324,53 @@
288 324  
289 325 BaseObjectResponse result = new BaseObjectResponse();
290 326  
291   - String ip = request.getRemoteAddr();
  327 + String ip = getIp(request);
292 328 System.out.println("time="+ DateUtil.getyyyy_MM_dd_hms(new Date())+";ip="+ip);
293 329  
294 330 nextPatient(ip);
295 331  
296 332 List<Map<String,String>> datas = new ArrayList<>();
297   - Map<String,String> map = new HashMap<>();
298   - map.put("patientId","11111");
299   - map.put("vcCardNo","1234123");
300   - map.put("name", "张啊");
301   - map.put("time", "11/21 10:22:21");
302   - map.put("gender", "男");
303 333  
  334 + Connection conn = null;
  335 + CallableStatement cs = null;
  336 + try {
  337 + conn = makeHisConnection();
  338 + //16 已叫号病人列表
  339 + //exec usp_mzhs_hsfzinterface 16,'192.168.1.219'
  340 + cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}");
  341 + cs.setString(1, "16");
  342 + cs.setString(2, ip);
  343 + ResultSet rs = cs.executeQuery();
304 344  
305   - Map<String,String> map1 = new HashMap<>();
306   - map1.put("patientId","22222");
307   - map1.put("vcCardNo","2341234");
308   - map1.put("name", "王丹");
309   - map1.put("time", "11/21 10:22:21");
310   - map1.put("gender", "女");
  345 + int count = rs.getMetaData().getColumnCount();
  346 + while (rs.next()) {
  347 + for (int i = 1; i <= count; i++)
  348 + {
  349 + String columnName = rs.getMetaData().getColumnName(i);
  350 + Object obj = rs.getObject(columnName);
  351 + System.out.println("callPatients columName=" + columnName+ ";value="+obj);
  352 + }
  353 + Map<String,String> map = new HashMap<>();
  354 + map.put("patientId",rs.getString("GHXH"));
  355 + map.put("vcCardNo",rs.getString("CARDNO"));
  356 + map.put("name", rs.getString("HZXM"));
  357 + map.put("time", rs.getString("JLRQ"));
  358 + map.put("gender", "");
  359 + datas.add(map);
  360 + }
  361 + }
  362 + catch (Exception e)
  363 + {
  364 + ExceptionUtils.catchException(e, "callPatients exception");
  365 + result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
  366 + result.setErrormsg("获取候诊队列失败");
  367 + return result;
  368 + }
  369 + finally
  370 + {
  371 + ConnTools.close(conn,cs);
  372 + }
311 373  
312   - datas.add(map);
313   - datas.add(map1);
314   -
315   -// Connection conn = null;
316   -// CallableStatement cs = null;
317   -// try {
318   -// conn = makeHisConnection();
319   -// //16 已叫号病人列表
320   -// //exec usp_mzhs_hsfzinterface 16,'192.168.1.219'
321   -// cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}");
322   -// cs.setString(1, "16");
323   -// cs.setString(2, ip);
324   -// ResultSet rs = cs.executeQuery();
325   -// Map<String,String> map = new HashMap<>();
326   -// map.put("卡号","");
327   -// map.put("姓名", "");
328   -// map.put("叫号时间", "");
329   -// map.put("性别", "");
330   -// datas.add(map);
331   -// }
332   -// catch (SQLException e)
333   -// {
334   -// ExceptionUtils.catchException(e, "callPatients exception");
335   -// result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
336   -// result.setErrormsg("获取候诊队列失败");
337   -// result.setData(datas);
338   -// return result;
339   -// }
340   -// finally
341   -// {
342   -// ConnTools.close(conn,cs);
343   -// }
344   -
345 374 result.setErrorcode(ErrorCodeConstants.SUCCESS);
346 375 result.setErrormsg("复呼成功");
347 376 result.setData(datas);
348 377  
... ... @@ -351,29 +380,34 @@
351 380  
352 381 private boolean nextPatient(String ip)
353 382 {
354   -// Connection conn = null;
355   -// CallableStatement cs = null;
356   -// try {
357   -// conn = makeHisConnection();
358   -// //2 取下一个病人
359   -// //exec usp_mzhs_hsfzinterface '2','192.168.1.219'
360   -// cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}");
361   -// cs.setString(1, "2");
362   -// cs.setString(2, ip);
363   -// cs.executeQuery();
364   -// return true;
365   -// }
366   -// catch (SQLException e)
367   -// {
368   -// ExceptionUtils.catchException(e, "nextPatient exception");
369   -// }
370   -// finally
371   -// {
372   -// ConnTools.close(conn,cs);
373   -// }
  383 + Connection conn = null;
  384 + CallableStatement cs = null;
  385 + try {
  386 + conn = makeHisConnection();
  387 + //2 取下一个病人
  388 + //exec usp_mzhs_hsfzinterface '2','192.168.1.219'
  389 + cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}");
  390 + cs.setString(1, "2");
  391 + cs.setString(2, ip);
  392 + cs.executeQuery();
  393 + return true;
  394 + }
  395 + catch (Exception e)
  396 + {
  397 + ExceptionUtils.catchException(e, "nextPatient exception");
  398 + }
  399 + finally
  400 + {
  401 + ConnTools.close(conn,cs);
  402 + }
374 403 return false;
375 404 }
376 405  
  406 +
  407 + private String getIp(HttpServletRequest request)
  408 + {
  409 + return request.getHeader("x-real-ip");
  410 + }
377 411  
378 412 public String getMACAddress(String ip) {
379 413 String line = "";
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 6dbed81
1 1 package com.lyms.platform.operate.web.controller;
2 2  
3 3  
  4 +import com.lyms.hospitalapi.whfy.VirtualCallService;
4 5 import com.lyms.platform.biz.service.BasicConfigService;
5 6 import com.lyms.platform.biz.service.OrganizationGroupsService;
6 7 import com.lyms.platform.common.annotation.TokenRequired;
7 8  
... ... @@ -74,7 +75,11 @@
74 75 private SessionProvider iSessionProvider;
75 76 @Autowired
76 77 private AutoMatchFacade autoMatchFacade;
  78 +
77 79 @Autowired
  80 + private VirtualCallService virtualCallService;
  81 +
  82 + @Autowired
78 83 private BasicConfigService basicConfigService;
79 84 @Autowired
80 85 private CouponService couponService;
... ... @@ -1303,6 +1308,11 @@
1303 1308 if(StringUtils.isNotEmpty(hospitalId)){
1304 1309 operateLogFacade.addAddOptLog(getUserId(request),
1305 1310 Integer.parseInt(hospitalId), param, OptActionEnums.ADD.getId(), "用户登出");
  1311 + }
  1312 + if ("2100001635".equals(hospitalId))
  1313 + {
  1314 + System.out.println("威海医生登出,登出虚拟叫号!");
  1315 + virtualCallService.callLoginOut(request,getUserId(request));
1306 1316 }
1307 1317 }
1308 1318 Map<String, Object> result = new HashMap<>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 6dbed81
1 1 package com.lyms.platform.operate.web.facade;
2 2  
  3 +import com.lyms.hospitalapi.lcdcf.LcdcfHisModel;
  4 +import com.lyms.hospitalapi.lcdcf.LcdcfHisService;
3 5 import com.lyms.platform.biz.RemoteService;
4 6 import com.lyms.platform.biz.service.*;
5 7 import com.lyms.platform.common.constants.ErrorCodeConstants;
... ... @@ -57,6 +59,9 @@
57 59 @Autowired
58 60 private SieveService sieveService;
59 61 @Autowired
  62 + private LcdcfHisService lcdcfHisService;
  63 +
  64 + @Autowired
60 65 private AutoMatchFacade autoMatchFacade;
61 66 @Autowired
62 67 private PersonService personService;
... ... @@ -663,6 +668,21 @@
663 668 public BaseResponse queryMatDeliver(MatDeliverQueryRequest deliverQueryRequest, Integer userId) {
664 669  
665 670 String hospital = autoMatchFacade.getHospitalId(userId);
  671 +
  672 + //聊城东昌府分娩界面通过住院号从his中查询到孕妇的身份号码,然后用身份证号码作为院内系统的查询条件查询孕妇信息
  673 + if ("2100001305".equals(hospital) && StringUtils.isNotEmpty(deliverQueryRequest.getZhuYuanNo()))
  674 + {
  675 + LcdcfHisModel lcdcfHisModel = lcdcfHisService.getHisPatientByZyh(deliverQueryRequest.getZhuYuanNo());
  676 + if (lcdcfHisModel != null && StringUtils.isNotEmpty(lcdcfHisModel.getIdCard()))
  677 + {
  678 + deliverQueryRequest.setCardNo(lcdcfHisModel.getIdCard());
  679 + }
  680 + else
  681 + {
  682 + return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA);
  683 + }
  684 + }
  685 +
666 686 //获取
667 687 /* Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, -1);
668 688 if (null == patients) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java View file @ 6dbed81
... ... @@ -157,12 +157,14 @@
157 157 temp.put("modified", modified);
158 158 }
159 159  
  160 +
  161 + /** 产品改了 说以收缩压为主 */
160 162 private String getBpStatus(String ssy, String szy) {
161 163 String status = null;
162   - if(StringUtils.isNotEmpty(ssy) && StringUtils.isNotEmpty(szy)) {
163   - if(Double.parseDouble(ssy) < 90 || Double.parseDouble(szy) < 60) {
  164 + if(StringUtils.isNotEmpty(ssy)) {
  165 + if(Double.parseDouble(ssy) < 90) {
164 166 status = "低血压";
165   - } else if(Double.parseDouble(ssy) > 140 || Double.parseDouble(szy) < 90) {
  167 + } else if(Double.parseDouble(ssy) > 140) {
166 168 status = "高血压";
167 169 } else {
168 170 status = "正常";
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 6dbed81
... ... @@ -3768,14 +3768,14 @@
3768 3768  
3769 3769 //分娩时间
3770 3770 map.put("dueTimeYear", time.substring(0,4));
3771   - map.put("dueTimeMonth", time.substring(5, 6));
3772   - map.put("dueTimeDay", time.substring(7, 8));
3773   - map.put("dueTimeHour", time.substring(9, 10));
3774   - map.put("dueTimeMinute",time.substring(11, 12));
  3771 + map.put("dueTimeMonth", time.substring(4, 6));
  3772 + map.put("dueTimeDay", time.substring(6, 8));
  3773 + map.put("dueTimeHour", time.substring(8, 10));
  3774 + map.put("dueTimeMinute",time.substring(10, 12));
3775 3775 //体重
3776   - map.put("babyWeight", temp.getBabyWeight() == null? "" : UnitUtils.unitSplice(temp.getBabyWeight(), UnitConstants.G));
  3776 + map.put("babyWeight", temp.getBabyWeight() == null? "" : temp.getBabyWeight());
3777 3777 //身高
3778   - map.put("babyHeight", temp.getBabyHeight() == null ? "" : UnitUtils.unitSplice(temp.getBabyHeight(), UnitConstants.CM));
  3778 + map.put("babyHeight", temp.getBabyHeight() == null ? "" : temp.getBabyHeight());
3779 3779 //健康状态
3780 3780 map.put("babyHealthy", temp.getBabyHealthy());
3781 3781 }
... ... @@ -3798,7 +3798,6 @@
3798 3798 tc = chuModel.getProdTime() == null ? "" : String.valueOf(chuModel.getProdTime());
3799 3799 }
3800 3800  
3801   - map.put("baby", babyList);
3802 3801 //胎次
3803 3802 map.put("tc", tc);
3804 3803 //产次
... ... @@ -3807,7 +3806,7 @@
3807 3806 //双胎
3808 3807 map.put("tireNumber",data.getTireNumber());
3809 3808  
3810   - String deliveryMode = "2"; //为2的时候剖宫产,其他的不选
  3809 + String deliveryMode = ""; //为2的时候剖宫产,1为顺产 其他的不选
3811 3810 if (StringUtils.isNotEmpty(data.getDeliveryMode())) {
3812 3811 Map m = JsonUtil.str2Obj(data.getDeliveryMode(), Map.class);
3813 3812 String fmfs = null;
... ... @@ -3816,9 +3815,7 @@
3816 3815 if (b != null) {
3817 3816 fmfs = b.toString();
3818 3817 if (fmfs != null) {
3819   - if (fmfs.equals("2")) {
3820   -
3821   - }
  3818 + deliveryMode = fmfs;
3822 3819 }
3823 3820 }
3824 3821 }
... ... @@ -3837,7 +3834,7 @@
3837 3834 map.put("motherName", patients.getUsername());
3838 3835  
3839 3836 //母亲年龄
3840   - map.put("motheAge", UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()), UnitConstants.SUI));
  3837 + map.put("motheAge", DateUtil.getAge(patients.getBirth()));
3841 3838  
3842 3839 // String addressRegister = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(),
3843 3840 // patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService);
... ... @@ -3849,7 +3846,7 @@
3849 3846 //父亲姓名
3850 3847 map.put("fatherName",patients.getHusbandName() == null ? "" : patients.getHusbandName());
3851 3848 //父亲年龄
3852   - map.put("fatherAge",patients.getHusbandBirth() == null ? "" : UnitUtils.unitSplice(DateUtil.getAge(patients.getHusbandBirth()), UnitConstants.SUI));
  3849 + map.put("fatherAge",patients.getHusbandBirth() == null ? "" : DateUtil.getAge(patients.getHusbandBirth()));
3853 3850 //父亲工作单位
3854 3851 map.put("fatherWorkUnit", patients.getHworkUnit() == null ? "" : patients.getHworkUnit());
3855 3852  
... ... @@ -3906,8 +3903,8 @@
3906 3903 String qfDate = DateUtil.getYmd(new Date());
3907 3904 //签发日期
3908 3905 map.put("signDateYear", qfDate.substring(0,4));
3909   - map.put("signDateMonth", qfDate.substring(5,6));
3910   - map.put("signDateDay", qfDate.substring(7,8));
  3906 + map.put("signDateMonth", qfDate.substring(4,6));
  3907 + map.put("signDateDay", qfDate.substring(6,8));
3911 3908  
3912 3909 //母亲国籍
3913 3910 map.put("motherCountry", getBasicConfig(patients.getPcountryId()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverQueryRequest.java View file @ 6dbed81
... ... @@ -24,6 +24,17 @@
24 24 @FormParam
25 25 private String pid;
26 26  
  27 + //聊城东昌府住院号
  28 + private String zhuYuanNo;
  29 +
  30 + public String getZhuYuanNo() {
  31 + return zhuYuanNo;
  32 + }
  33 +
  34 + public void setZhuYuanNo(String zhuYuanNo) {
  35 + this.zhuYuanNo = zhuYuanNo;
  36 + }
  37 +
27 38 public String getPid() {
28 39 return pid;
29 40 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java View file @ 6dbed81
... ... @@ -229,12 +229,13 @@
229 229 return RespBuilder.buildSuccess();
230 230 }
231 231  
  232 + /** 产品改了 说以收缩压为主 */
232 233 private String getPulseStatus(String ssy, String szy) {
233 234 String status = "";
234   - if(StringUtils.isNotEmpty(ssy) && StringUtils.isNotEmpty(szy)) {
235   - if(Double.parseDouble(ssy) < 90 || Double.parseDouble(szy) < 60) {
  235 + if(StringUtils.isNotEmpty(ssy)) {
  236 + if(Double.parseDouble(ssy) < 90) {
236 237 status = "低血压";
237   - } else if(Double.parseDouble(ssy) > 140 || Double.parseDouble(szy) < 90) {
  238 + } else if(Double.parseDouble(ssy) > 140) {
238 239 status = "高血压";
239 240 } else {
240 241 status = "正常";