Commit 07a14d3da05f922bff786f2a5b7fe7c0f941fc87
1 parent
8c6b499967
Exists in
master
and in
6 other branches
德州妇幼Lis接口更新
Showing 3 changed files with 12 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyHisService.java
View file @
07a14d3
| ... | ... | @@ -231,7 +231,7 @@ |
| 231 | 231 | |
| 232 | 232 | |
| 233 | 233 | |
| 234 | - public List<CheckResponse> queryLisCheckList(String cardNo) { | |
| 234 | + public static List<CheckResponse> queryLisCheckList(String cardNo) { | |
| 235 | 235 | List<CheckResponse> result = new ArrayList<>(); |
| 236 | 236 | if (StringUtils.isNotBlank(cardNo)) { |
| 237 | 237 | Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeHisConnection(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
View file @
07a14d3
| 1 | 1 | package com.lyms.platform.operate.web.facade; |
| 2 | 2 | |
| 3 | 3 | import com.lyms.hospitalapi.Nczxyy.NczxyyLisService; |
| 4 | +import com.lyms.hospitalapi.dzfy.DzfyHisService; | |
| 4 | 5 | import com.lyms.hospitalapi.pojo.CheckByDate; |
| 5 | 6 | import com.lyms.hospitalapi.pojo.CheckItemResponse; |
| 6 | 7 | import com.lyms.hospitalapi.pojo.CheckResponse; |
| ... | ... | @@ -73,7 +74,11 @@ |
| 73 | 74 | if("7".equals(HIS_VERSION)){ |
| 74 | 75 | //根据调用接口获取四川南充中心医院的Lis数据 |
| 75 | 76 | result.addAll(NczxyyLisService.queryLisCheckList(vcCardNo)); |
| 76 | - }else{ | |
| 77 | + }else if("6".equals(HIS_VERSION)){ | |
| 78 | + //调用德州妇幼lis接口 | |
| 79 | + result.addAll(DzfyHisService.queryLisCheckList(vcCardNo)); | |
| 80 | + } | |
| 81 | + else{ | |
| 77 | 82 | result.addAll(queryLisCheckList(vcCardNo,phone,userId)); |
| 78 | 83 | } |
| 79 | 84 | //result.addAll(queryPacsCheckList(cardNo)); |
| ... | ... | @@ -161,6 +166,9 @@ |
| 161 | 166 | if("7".equals(HIS_VERSION)){ |
| 162 | 167 | //根据调用接口获取四川南充中心医院的Lis数据 |
| 163 | 168 | result.addAll(NczxyyLisService.queryLisCheckList(vcCardNo)); |
| 169 | + }else if("6".equals(HIS_VERSION)){ | |
| 170 | + //调用德州妇幼lis接口 | |
| 171 | + result.addAll(DzfyHisService.queryLisCheckList(vcCardNo)); | |
| 164 | 172 | }else{ |
| 165 | 173 | result.addAll(queryLisCheckList(vcCardNo,phone,userId)); |
| 166 | 174 | } |
| ... | ... | @@ -804,7 +812,7 @@ |
| 804 | 812 | map1.put("bxbjs","");//白细胞计数 |
| 805 | 813 | map1.put("xxbjs",""); //血小板计数 |
| 806 | 814 | String itemJson = model.getItemJson(); |
| 807 | - List<LisReportItemModel> items = JsonUtil.toList(itemJson,LisReportItemModel.class); | |
| 815 | + List<LisReportItemModel> items = JsonUtil.toList(itemJson, LisReportItemModel.class); | |
| 808 | 816 | if (CollectionUtils.isNotEmpty(items)) |
| 809 | 817 | { |
| 810 | 818 | for(LisReportItemModel item : items) |
platform-operate-api/src/main/resources/config.properties
View file @
07a14d3