2.不分参数名和类名冲突调整 3.新增人脸识别失败的错误信息枚举,并返回错误信息. 4.体检影像报告查询交互加密调整 5.电子健康卡人脸识别接口,区别于微信人脸识别接口,签名生成调整.debug
parent
2a53cbf4fd
commit
ec5fdd390f
36 changed files with 708 additions and 369 deletions
@ -0,0 +1,36 @@ |
||||
package com.ynxbd.common.bean.enums; |
||||
|
||||
import lombok.ToString; |
||||
|
||||
@ToString |
||||
public enum WxFaceEnum { |
||||
E40003(40003, "[认证失败]openid无效"), |
||||
E84010(84010, "缺少out_seq_no 参数"), |
||||
E84011(84011, "out_seq_no 格式无效"), |
||||
E84012(84012, "缺少cert_info参数"), |
||||
E84013(84013, "证件类型无效"), |
||||
E84014(84014, "证件姓名无效"), |
||||
E84015(84015, "证件号码无效"), |
||||
E84016(84016, "缺少openid参数"), |
||||
E84019(84019, "out_seq_no 已存在，请更换新的 out_seq_no"); |
||||
|
||||
public final Integer code; |
||||
public final String msg; |
||||
|
||||
WxFaceEnum(Integer code, String msg) { |
||||
this.code = code; |
||||
this.msg = msg; |
||||
} |
||||
|
||||
public static WxFaceEnum findEnum(Integer code) { |
||||
if (code == null) { |
||||
return null; |
||||
} |
||||
for (WxFaceEnum value : values()) { |
||||
if (value.code.equals(code)) { |
||||
return value; |
||||
} |
||||
} |
||||
return null; |
||||
} |
||||
} |
||||
@ -0,0 +1,20 @@ |
||||
package com.ynxbd.common.bean.xk; |
||||
|
||||
import lombok.Getter; |
||||
import lombok.NoArgsConstructor; |
||||
import lombok.Setter; |
||||
import lombok.ToString; |
||||
|
||||
// 给要途径字典
|
||||
@Setter |
||||
@Getter |
||||
@ToString |
||||
@NoArgsConstructor |
||||
public class HisRxAdmRoute { |
||||
// Code 编码
|
||||
private String code; |
||||
// Name 名称
|
||||
private String name; |
||||
// PYM 拼音码
|
||||
private String pym; |
||||
} |
||||
@ -0,0 +1,50 @@ |
||||
package com.ynxbd.common.bean.xk; |
||||
|
||||
import lombok.Getter; |
||||
import lombok.NoArgsConstructor; |
||||
import lombok.Setter; |
||||
import lombok.ToString; |
||||
|
||||
// 药品
|
||||
@Setter |
||||
@Getter |
||||
@ToString |
||||
@NoArgsConstructor |
||||
public class HisRxDrug { |
||||
// Code 商品代码
|
||||
private String code; |
||||
// Name 商品名称
|
||||
private String name; |
||||
// ProductPlace 产地
|
||||
private String productPlace; |
||||
// UnitName 单位名称
|
||||
private String unitName; |
||||
// UnitName 最小单位名称
|
||||
private String minUnitName; |
||||
// Persent 批零比
|
||||
private Double persent; |
||||
// YPJL 药品剂量
|
||||
private Double ypjl; |
||||
// YPJL_Unit 药品剂量单位
|
||||
private String ypjlUnit; |
||||
// Price 零售单价
|
||||
private Double price; |
||||
// Count 库存数量
|
||||
private Integer count; |
||||
// YFCode 药房代码
|
||||
private String yfCode; |
||||
// YFName 药房名称
|
||||
private String yfName; |
||||
// GOODSID 批次号
|
||||
private String goodsId; |
||||
// Indate 效期
|
||||
private String indate; |
||||
// KMCode 财务科目代码
|
||||
private String kmCode; |
||||
// KMName 财务科目名称
|
||||
private String kmName; |
||||
// YBLB 医保类别
|
||||
private String yblb; |
||||
// YBLBName 医保类别名称
|
||||
private String yblbName; |
||||
} |
||||
@ -0,0 +1,18 @@ |
||||
package com.ynxbd.common.bean.xk; |
||||
|
||||
import lombok.Getter; |
||||
import lombok.NoArgsConstructor; |
||||
import lombok.Setter; |
||||
import lombok.ToString; |
||||
|
||||
// 药房字典
|
||||
@Setter |
||||
@Getter |
||||
@ToString |
||||
@NoArgsConstructor |
||||
public class HisRxPharmDict { |
||||
// Code 编码
|
||||
private String code; |
||||
// Name 名称
|
||||
private String name; |
||||
} |
||||
@ -0,0 +1,23 @@ |
||||
package com.ynxbd.common.bean.xk; |
||||
|
||||
import lombok.Getter; |
||||
import lombok.NoArgsConstructor; |
||||
import lombok.Setter; |
||||
import lombok.ToString; |
||||
|
||||
@Setter |
||||
@Getter |
||||
@ToString |
||||
@NoArgsConstructor |
||||
public class HisRxUseCount { |
||||
// Code 编码
|
||||
private String code; |
||||
// Name 名称
|
||||
private String name; |
||||
// CountForDay 一天使用次数
|
||||
private Integer countForDay; |
||||
// CountForWeek 一周使用次数
|
||||
private Integer countForWeek; |
||||
// PYM 拼音码
|
||||
private String pym; |
||||
} |
||||
@ -0,0 +1,38 @@ |
||||
package com.ynxbd.common.dao.his; |
||||
|
||||
import com.ynxbd.common.bean.xk.HisRxAdmRoute; |
||||
import com.ynxbd.common.bean.xk.HisRxDrug; |
||||
import com.ynxbd.common.bean.xk.HisRxPharmDict; |
||||
import com.ynxbd.common.bean.xk.HisRxUseCount; |
||||
import com.ynxbd.common.helper.his.HisEnum; |
||||
import com.ynxbd.common.helper.his.HisHelper; |
||||
import com.ynxbd.common.result.JsonResult; |
||||
import com.ynxbd.common.result.ServiceException; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
|
||||
import java.util.ArrayList; |
||||
import java.util.List; |
||||
|
||||
@Slf4j |
||||
public class HisXKDao { |
||||
|
||||
public List<?> queryHisRxDict(String type) { |
||||
JsonResult jsonResult = HisHelper.getJsonResult(HisEnum.HIS_XK_RX_DICT, params -> { |
||||
params.put("Flag", type); // 1:用药频次字典; 2:给要途径字典; 3:药房字典; 4:药品
|
||||
}); |
||||
if ("1".equals(type)) { // 用药频次字典
|
||||
return jsonResult.getDataMapList(HisRxUseCount.class, "Items", "Item"); |
||||
} |
||||
if ("2".equals(type)) { // 给要途径字典
|
||||
return jsonResult.getDataMapList(HisRxAdmRoute.class, "Items", "Item"); |
||||
} |
||||
if ("3".equals(type)) { // 药房字典
|
||||
return jsonResult.getDataMapList(HisRxPharmDict.class, "Items", "Item"); |
||||
} |
||||
if ("4".equals(type)) { // 药品
|
||||
return jsonResult.getDataMapList(HisRxDrug.class, "Items", "Item"); |
||||
} |
||||
return new ArrayList<>(); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,8 @@ |
||||
package com.ynxbd.common.helper.rsa; |
||||
|
||||
import lombok.ToString; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
|
||||
@ToString |
||||
public class RSAEnum { |
||||
} |
||||
@ -1 +1 @@ |
||||
# \u5F00\u542F\u5904\u65B9\u9884\u7ED3\u7B97\uFF08\u7B2C2\u5F00\u5173\uFF09\uFF08\u6CE8\u610F\u8BE5\u914D\u7F6E\u9700\u8054\u7CFBhis\u5F00\u53D1\u8005\u786E\u8BA4\u652F\u6301\u624D\u80FD\u5F00\u542F\uFF0C\u5426\u5219\u5B58\u5728\u98CE\u9669\uFF01\uFF09
his.is_recipe_prepay=false
# \u672C\u5730
#his.url=127.0.0.1:8888
# HIS\u662F\u5426\u5F00\u542F\u652F\u4ED8\u5B9D\u5206\u5F00\u5BF9\u8D26
his.is_ali_mer=false
# \u662F\u5426\u5F3A\u5236\u6253\u5370webservice\u7684xml\u8FD4\u56DE\u6570\u636E
his.is_log_resp=true
# \u5DDE\u50A3\u533B\u4F7F\u7528
his.is_req_cdata=false
# \u662F\u5426\u4F20\u9012openid\u7ED9his\u63A8\u9001\u6D88\u606F
his.is_push_msg=false
#-------------------------------
# \u6D4B\u8BD5\u73AF\u5883
his.dev_url=200.200.200.105:8888
# \u533B\u4FDD===========================
# \u65E7\u914D\u7F6E
his.md_url=127.0.0.1:7777
# \u5FAE\u4FE1\u533B\u4FDD
his.wx_med_url=10.20.10.7:7885
# \u652F\u4ED8\u5B9D\u533B\u4FDD
his.ali_med_url=10.20.10.7:7885
# \u6D4B\u8BD5============================================================
# \u516C\u53F8\u6D4B\u8BD5
#his.url=192.168.12.10:8888
# \u77F3\u6797\u53BF\u533B\u9662
#his.url=200.200.200.105:8888
# \u5FB7\u5B8F\u4E2D\u533B
#his.url=200.200.200.60:9999
# \u7EA2\u6CB3\u5DDE\u533B\u9662
his.url=10.20.10.6:8888
# \u8292\u5E02\u5987\u5E7C
#his.url=192.168.11.7:8888
# \u5B81\u8497\u5987\u5E7C
#his.url=172.19.3.15:8888
# \u5B81\u8497\u53BF\u533B\u9662
#his.url=192.168.10.8:8888
# \u516C\u53F8\u6D4B\u8BD5
#his.url=192.168.12.39:8888
#\u666F\u6D2A\u4E2D\u50A3\u533B
#his.url=192.168.197.217:8888
# \u516C\u53F8\u6D4B\u8BD5
#his.url=192.168.12.10:8888
# \u7EA2\u6CB3
#his.url=10.20.10.6:8888
# \u7EA2\u6CB3\u533B\u4FDD
#his.url=10.20.10.6:8888
#his.url=192.168.12.10:8888
#his.md_url=192.168.1.128:7885
#his.dev_url=10.20.10.6:9988
# \u6C38\u80DC
#his.url=200.200.200.20:8888
# \u5FB7\u5B8F\u4E2D\u533B
#his.url=200.200.200.60:8888
# \u534E\u576A
#his.url=192.168.1.115:8888
# \u8499\u81EA\u4E2D\u533B
#his.url=192.168.0.228:8888
# \u7389\u9F99
#his.url=192.168.0.17:8888
#
#his.url=172.16.10.15:8888
# \u7984\u529D\u949F\u7231
#his.url=200.200.200.5:8888
# \u8499\u81EA\u5E02\u4EBA\u6C11\u533B\u9662
#his.url=200.200.200.174:8080
# \u5143\u8C0B
#his.url=200.200.200.29:8888
# \u5143\u8C0B\u533B\u4FDD
#his.dev_url=200.200.200.36:9999
# \u8292\u5E02
#his.url=192.168.100.8:8888
# \u7EA2\u6CB3\u5987\u5E7C\u4FDD\u5065\u9662
#his.url=192.168.1.204:8888
# \u8292\u5E02\u5987\u5E7C
#his.url=192.168.11.7:8888
#
#his.url=10.10.11.23:8888
# \u77F3\u6797
#his.url=192.168.10.10:8888
# \u5BCC\u6C11
#his.url=200.200.201.27:8888
# \u897F\u53CC\u7248\u7EB3
#his.url=10.10.11.23:8888
#wx.password=ynxbd@6910 |
||||
# \u5F00\u542F\u5904\u65B9\u9884\u7ED3\u7B97\uFF08\u7B2C2\u5F00\u5173\uFF09\uFF08\u6CE8\u610F\u8BE5\u914D\u7F6E\u9700\u8054\u7CFBhis\u5F00\u53D1\u8005\u786E\u8BA4\u652F\u6301\u624D\u80FD\u5F00\u542F\uFF0C\u5426\u5219\u5B58\u5728\u98CE\u9669\uFF01\uFF09
his.is_recipe_prepay=false
# \u672C\u5730
#his.url=127.0.0.1:8888
# HIS\u662F\u5426\u5F00\u542F\u652F\u4ED8\u5B9D\u5206\u5F00\u5BF9\u8D26
his.is_ali_mer=false
# \u662F\u5426\u5F3A\u5236\u6253\u5370webservice\u7684xml\u8FD4\u56DE\u6570\u636E
his.is_log_resp=true
# \u5DDE\u50A3\u533B\u4F7F\u7528
his.is_req_cdata=false
# \u662F\u5426\u4F20\u9012openid\u7ED9his\u63A8\u9001\u6D88\u606F
his.is_push_msg=false
#-------------------------------
# \u6D4B\u8BD5\u73AF\u5883
his.dev_url=200.200.200.60:7777
# \u533B\u4FDD===========================
# \u65E7\u914D\u7F6E
his.md_url=127.0.0.1:7777
# \u5FAE\u4FE1\u533B\u4FDD
his.wx_med_url=10.20.10.7:7885
# \u652F\u4ED8\u5B9D\u533B\u4FDD
his.ali_med_url=10.20.10.7:7885
# \u6D4B\u8BD5============================================================
# \u516C\u53F8\u6D4B\u8BD5
#his.url=192.168.12.10:8888
# \u77F3\u6797\u53BF\u533B\u9662
#his.url=200.200.200.105:8888
# \u5FB7\u5B8F\u4E2D\u533B
his.url=200.200.200.60:7777
# \u7EA2\u6CB3\u5DDE\u533B\u9662
#his.url=10.20.10.6:8888
# \u8292\u5E02\u5987\u5E7C
#his.url=192.168.11.7:8888
# \u5B81\u8497\u5987\u5E7C
#his.url=172.19.3.15:8888
# \u5B81\u8497\u53BF\u533B\u9662
#his.url=192.168.10.8:8888
# \u516C\u53F8\u6D4B\u8BD5
#his.url=192.168.12.39:8888
#\u666F\u6D2A\u4E2D\u50A3\u533B
#his.url=192.168.197.217:8888
# \u516C\u53F8\u6D4B\u8BD5
#his.url=192.168.12.10:8888
# \u7EA2\u6CB3
#his.url=10.20.10.6:8888
# \u7EA2\u6CB3\u533B\u4FDD
#his.url=10.20.10.6:8888
#his.url=192.168.12.10:8888
#his.md_url=192.168.1.128:7885
#his.dev_url=10.20.10.6:9988
# \u6C38\u80DC
#his.url=200.200.200.20:8888
# \u5FB7\u5B8F\u4E2D\u533B
#his.url=200.200.200.60:8888
# \u534E\u576A
#his.url=192.168.1.115:8888
# \u8499\u81EA\u4E2D\u533B
#his.url=192.168.0.228:8888
# \u7389\u9F99
#his.url=192.168.0.17:8888
#
#his.url=172.16.10.15:8888
# \u7984\u529D\u949F\u7231
#his.url=200.200.200.5:8888
# \u8499\u81EA\u5E02\u4EBA\u6C11\u533B\u9662
#his.url=200.200.200.174:8080
# \u5143\u8C0B
#his.url=200.200.200.29:8888
# \u5143\u8C0B\u533B\u4FDD
#his.dev_url=200.200.200.36:9999
# \u8292\u5E02
#his.url=192.168.100.8:8888
# \u7EA2\u6CB3\u5987\u5E7C\u4FDD\u5065\u9662
#his.url=192.168.1.204:8888
# \u8292\u5E02\u5987\u5E7C
#his.url=192.168.11.7:8888
#
#his.url=10.10.11.23:8888
# \u77F3\u6797
#his.url=192.168.10.10:8888
# \u5BCC\u6C11
#his.url=200.200.201.27:8888
# \u897F\u53CC\u7248\u7EB3
#his.url=10.10.11.23:8888
#wx.password=ynxbd@6910 |
||||
Loading…
Reference in new issue