jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 5aff5e89319b791a83cd2e4848c266f142b784c5

Authored by jiangjiazhi
2 parents c2ec14cda9 56970c64d9
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 9 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java View file @ 5aff5e8
... ... @@ -21,6 +21,18 @@
21 21 private String genRemark; // 一般检查备注
22 22 private String gynRemark; // 妇科检查备注
23 23  
  24 +
  25 + //该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项
  26 + private String lisCheckItems;
  27 +
  28 + public String getLisCheckItems() {
  29 + return lisCheckItems;
  30 + }
  31 +
  32 + public void setLisCheckItems(String lisCheckItems) {
  33 + this.lisCheckItems = lisCheckItems;
  34 + }
  35 +
24 36 public String getGenRemark() {
25 37 return genRemark;
26 38 }
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java View file @ 5aff5e8
... ... @@ -18,6 +18,18 @@
18 18  
19 19 private String genRemark; // 一般检查备注
20 20  
  21 + //该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项
  22 + private String lisCheckItems;
  23 +
  24 +
  25 + public String getLisCheckItems() {
  26 + return lisCheckItems;
  27 + }
  28 +
  29 + public void setLisCheckItems(String lisCheckItems) {
  30 + this.lisCheckItems = lisCheckItems;
  31 + }
  32 +
21 33 public String getGenRemark() {
22 34 return genRemark;
23 35 }
platform-operate-api/src/main/java/com/lyms/hospitalapi/whfy/VirtualCallService.java View file @ 5aff5e8
... ... @@ -6,6 +6,7 @@
6 6 import com.lyms.platform.common.utils.DateUtil;
7 7 import com.lyms.platform.common.utils.ExceptionUtils;
8 8 import com.lyms.platform.common.utils.StringUtils;
  9 +import com.lyms.platform.operate.web.utils.VirtualUtil;
9 10 import com.lyms.platform.permission.model.Departments;
10 11 import com.lyms.platform.permission.model.Users;
11 12 import com.lyms.platform.permission.service.DepartmentsService;
... ... @@ -114,6 +115,8 @@
114 115 }
115 116 result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
116 117 result.setErrormsg("登陆异常");
  118 +
  119 + VirtualUtil.sendVoice("登陆成功");
117 120 return result;
118 121 }
119 122  
... ... @@ -424,6 +427,7 @@
424 427 cs.execute();
425 428 ResultSet rs = cs.getResultSet();
426 429 int count = rs.getMetaData().getColumnCount();
  430 + String content = "";
427 431 while (rs.next()) {
428 432 for (int i = 1; i <= count; i++) {
429 433 String columnName = rs.getMetaData().getColumnName(i);
... ... @@ -431,7 +435,7 @@
431 435 System.out.println("nextPatient columName=" + columnName + ";value=" + value);
432 436 }
433 437 }
434   -
  438 + VirtualUtil.sendVoice(content);
435 439 return true;
436 440 }
437 441 catch (Exception e)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java View file @ 5aff5e8
... ... @@ -87,20 +87,8 @@
87 87 if(1 == sortType){
88 88 List<CheckResponse> result = new ArrayList<>();
89 89 //获取lis数据
90   -// if("7".equals(HIS_VERSION)){
91   -// //根据调用接口获取四川南充中心医院的Lis数据
92   -// result.addAll(NczxyyLisService.queryLisCheckList(vcCardNo));
93   -//// }else if("6".equals(HIS_VERSION)){
94   -//// //调用德州妇幼lis接口
95   -//// result.addAll(DzfyHisService.queryLisCheckList(vcCardNo));
96   -// }
97   -// else{
98   -// result.addAll(queryLisCheckList(vcCardNo,phone,userId));
99   -// }
100   -
101 90 result.addAll(queryLisCheckList(vcCardNo,phone,userId));
102 91  
103   - //result.addAll(queryPacsCheckList(cardNo));
104 92 List<String> keyList = new ArrayList<>();
105 93 // 排序
106 94 Collections.sort(result, new Comparator() {
107 95  
... ... @@ -174,19 +162,9 @@
174 162 }else{
175 163  
176 164 List<CheckResponse> result = new ArrayList<CheckResponse>();
177   -// if("7".equals(HIS_VERSION)){
178   -// //根据调用接口获取四川南充中心医院的Lis数据
179   -// result.addAll(NczxyyLisService.queryLisCheckList(vcCardNo));
180   -// }else if("6".equals(HIS_VERSION)){
181   -// //调用德州妇幼lis接口
182   -// result.addAll(DzfyHisService.queryLisCheckList(vcCardNo));
183   -// }else{
184   -// result.addAll(queryLisCheckList(vcCardNo,phone,userId));
185   -// }
186 165  
187 166 result.addAll(queryLisCheckList(vcCardNo,phone,userId));
188 167  
189   - //result.addAll(queryPacsCheckList(cardNo));
190 168 List<String> keyList = new ArrayList<>();
191 169 List<String> listtype=new ArrayList<>();
192 170 List<CheckResponse> listt = new ArrayList<>();
... ... @@ -209,7 +187,6 @@
209 187 t=check.getTitle();
210 188 }
211 189  
212   -
213 190 // 排序
214 191 Collections.sort(list, new Comparator() {
215 192 public int compare(Object a, Object b) {
... ... @@ -225,8 +202,6 @@
225 202 return -1;
226 203 }
227 204 });
228   -
229   -
230 205  
231 206 for (CheckResponse check:list) {
232 207  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 5aff5e8
... ... @@ -1787,6 +1787,9 @@
1787 1787 map.put("dirOpinion", data.getDirOpinion());
1788 1788 map.put("quicken", QuickenEnums.getName(data.getQuicken()));
1789 1789  
  1790 + //聊城东昌府区妇幼保健医院特有字段
  1791 + map.put("lisCheckItems",data.getLisCheckItems());
  1792 +
1790 1793 br.setErrorcode(ErrorCodeConstants.SUCCESS);
1791 1794 br.setErrormsg("成功");
1792 1795 br.setData(map);
... ... @@ -2061,6 +2064,9 @@
2061 2064  
2062 2065 /** 优惠券编号 */
2063 2066 map.put("couponCode", couponService.findByUsedId(id));
  2067 +
  2068 + //聊城东昌府区妇幼保健医院才用
  2069 + map.put("lisCheckItems",data.getLisCheckItems());
2064 2070  
2065 2071 br.setErrorcode(ErrorCodeConstants.SUCCESS);
2066 2072 br.setErrormsg("成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ 5aff5e8
... ... @@ -18,6 +18,18 @@
18 18  
19 19 private String genRemark; // 一般检查备注
20 20  
  21 +
  22 + //该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项
  23 + private String lisCheckItems;
  24 +
  25 + public String getLisCheckItems() {
  26 + return lisCheckItems;
  27 + }
  28 +
  29 + public void setLisCheckItems(String lisCheckItems) {
  30 + this.lisCheckItems = lisCheckItems;
  31 + }
  32 +
21 33 public String getGenRemark() {
22 34 return genRemark;
23 35 }
... ... @@ -318,6 +330,7 @@
318 330 @Override
319 331 public AntenatalExaminationModel convertToDataModel() {
320 332 AntenatalExaminationModel examinationModel = new AntenatalExaminationModel();
  333 + examinationModel.setLisCheckItems(lisCheckItems);
321 334 examinationModel.setGenRemark(genRemark);
322 335 examinationModel.setmHighRiskReason(mHighRiskReason);
323 336 examinationModel.setQuicken(quicken);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ 5aff5e8
... ... @@ -1325,7 +1325,7 @@
1325 1325 @Override
1326 1326 public AntExChuModel convertToDataModel() {
1327 1327 AntExChuModel antExChuModel = new AntExChuModel();
1328   -
  1328 + antExChuModel.setLisCheckItems(lisCheckItems);
1329 1329 antExChuModel.setGenRemark(genRemark);
1330 1330 antExChuModel.setGynRemark(gynRemark);
1331 1331 antExChuModel.setTreatmentOpinion2(treatmentOpinion2);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/VirtualUtil.java View file @ 5aff5e8
  1 +package com.lyms.platform.operate.web.utils;
  2 +
  3 +import com.lyms.platform.common.utils.*;
  4 +
  5 +import java.util.HashMap;
  6 +import java.util.Map;
  7 +
  8 +/**
  9 + * Created by Administrator on 2017-12-18.
  10 + */
  11 +public class VirtualUtil {
  12 +
  13 + static String area_count_url = PropertiesUtils.getPropertyValue("virtual_call_url");
  14 +
  15 + /**
  16 + * 调用语音发送
  17 + * @param content 语音内容
  18 + */
  19 + public static void sendVoice(String content)
  20 + {
  21 + if (StringUtils.isNotEmpty(content))
  22 + {
  23 + Map<String,String> param = new HashMap<>();
  24 + param.put("content", content);
  25 + com.lyms.platform.common.utils.HttpClientUtil.doGet(area_count_url, param, "utf-8",null);
  26 + }
  27 + }
  28 +}
platform-operate-api/src/main/resources/config.properties View file @ 5aff5e8
... ... @@ -80,4 +80,8 @@
80 80 jdbc.7.password=Welcome1
81 81  
82 82 platform.operate.api.validate.url=http://localhost:8080/
  83 +
  84 +
  85 +#威海虚拟叫号语音机器地址
  86 +virtual_call_url=http://localhost:8090/Voice.ashx