diff --git a/src/main/java/com/ynxbd/common/TestA.java b/src/main/java/com/ynxbd/common/TestA.java index c846281..6acbd6c 100644 --- a/src/main/java/com/ynxbd/common/TestA.java +++ b/src/main/java/com/ynxbd/common/TestA.java @@ -1,5 +1,6 @@ package com.ynxbd.common; +import cn.hutool.core.util.IdcardUtil; import lombok.extern.slf4j.Slf4j; @Slf4j @@ -13,16 +14,16 @@ public class TestA { // System.out.println(DesEncryptHelper.enCode("oeso-t62kkoRwLVVkSkwmmjPfUXk")); // // System.out.println(MessagePushConfig.REG_NAVIGATE_API); -//// OkHttpHelper.getAsync(REG_NAVIGATE_API, params -> { -//// params.put("patientName", "小王"); -//// params.put("content", "就诊时间：2026-08-13 12:12:12"); -//// params.put("deptName", "科室"); -//// params.put("deptCode", "0001"); -//// params.put("openId", "32EBE22EF6C9437575AB7A043E456D25704583EFA5E6BE1B5CB899A6F3B7075A"); -//// }); + + /// / OkHttpHelper.getAsync(REG_NAVIGATE_API, params -> { + /// / params.put("patientName", "小王"); + /// / params.put("content", "就诊时间：2026-08-13 12:12:12"); + /// / params.put("deptName", "科室"); + /// / params.put("deptCode", "0001"); + /// / params.put("openId", "32EBE22EF6C9437575AB7A043E456D25704583EFA5E6BE1B5CB899A6F3B7075A"); + /// / }); // test(); // } - public static void test() { // String xml = "40090成功0.00ORD530100202608121122576630746TSN5301002026081211225734038313119968898754003081656516118908900{\"setlinfo\":{\"psnCashPay\":0,\"inscpScpAmt\":81,\"medinsSetlId\":\"H53310300023202608121122583668\",\"medType\":\"21\",\"age\":25,\"acctPay\":89,\"psnType\":\"11\",\"psnName\":\"王晨宇\",\"mdtrtCertNo\":\"530000ocvpvqk10ujb26a3720a00009bfc99ea\",\"insuAdmdvs\":\"533199\",\"hifobPay\":0,\"psnCertType\":\"01\",\"mdtrtCertType\":\"01\",\"actPayDedc\":81,\"psnPay\":89,\"psnInsuRltsId\":\"53000000300121343792\",\"overlmtSelfpay\":5,\"ownpayHospPart\":0,\"medfeeSumamt\":89,\"mdtrtId\":\"311996889875\",\"hifmiPay\":0,\"certno\":\"533103200008164016\",\"crtDedc\":81,\"hifpPay\":0,\"poolPropSelfpay\":0,\"clrType\":\"21\",\"mafPay\":0,\"cvlservPay\":0,\"setlTime\":\"2026-08-12 11:22:59\",\"hospPartAmt\":0,\"expContent\":\"{\\\"unif_pay_std\\\":0,\\\"unif_pay_blnc\\\":0,\\\"bkst_safeg_amt\\\":0,\\\"fin_subs\\\":null,\\\"care_subs\\\":null,\\\"insu_cmpy_name\\\":\\\"\\\",\\\"comp_sum_amt\\\":null,\\\"comp_dscr\\\":\\\"\\\",\\\"comp_fail_rea\\\":\\\"\\\",\\\"bas_sec_pool_lmt\\\":0,\\\"mihisec_pool_lmt\\\":0,\\\"cvlserv_acct_pay\\\":0,\\\"oth_subs\\\":null,\\\"bas_sev_inpool_amt\\\":0,\\\"mihisec_inpool_amt\\\":0,\\\"third_pay_list\\\":[],\\\"sp_psn_type\\\":\\\"95341\\\",\\\"cvlserv_lmt_rm\\\":0,\\\"wlt_acct_pay\\\":0,\\\"hosp_payf_amt\\\":0,\\\"cla_trt_flag\\\":\\\"1\\\"}\",\"othPay\":0,\"dedcStd\":600,\"othfundPay\":0,\"preselfpayAmt\":3,\"cashPayamt\":0,\"fulamtOwnpayAmt\":0,\"fundPaySumamt\":0,\"cvlservFlag\":\"0\",\"insutype\":\"310\",\"acctMulaidPay\":0,\"psnPartAmt\":89,\"enddate\":1785838099000,\"hifesPay\":0,\"naty\":\"01\",\"gend\":\"1\",\"brdy\":\"2000-08-16\",\"balc\":242.38,\"inscpAmt\":81,\"hifdmPay\":0,\"begndate\":1785813000000,\"psnNo\":\"DH5310062846\"},\"SETLINFO\":{\"psn_part_amt\":89,\"hifob_pay\":0,\"age\":25,\"psn_pay\":89,\"preselfpay_amt\":3,\"oth_pay\":0,\"hifp_pay\":0,\"overlmt_selfpay\":5,\"hifes_pay\":0,\"psn_cash_pay\":0,\"maf_pay\":0,\"dedc_std\":600,\"act_pay_dedc\":81,\"inscp_amt\":81,\"mdtrt_id\":\"311996889875\",\"hifmi_pay\":0,\"crt_dedc\":81,\"psn_no\":\"DH5310062846\",\"medins_setl_id\":\"H53310300023202608121122583668\",\"certno\":\"533103200008164016\",\"psn_cert_type\":\"01\",\"exp_content\":\"{\\\"unif_pay_std\\\":0,\\\"unif_pay_blnc\\\":0,\\\"bkst_safeg_amt\\\":0,\\\"fin_subs\\\":null,\\\"care_subs\\\":null,\\\"insu_cmpy_name\\\":\\\"\\\",\\\"comp_sum_amt\\\":null,\\\"comp_dscr\\\":\\\"\\\",\\\"comp_fail_rea\\\":\\\"\\\",\\\"bas_sec_pool_lmt\\\":0,\\\"mihisec_pool_lmt\\\":0,\\\"cvlserv_acct_pay\\\":0,\\\"oth_subs\\\":null,\\\"bas_sev_inpool_amt\\\":0,\\\"mihisec_inpool_amt\\\":0,\\\"third_pay_list\\\":[],\\\"sp_psn_type\\\":\\\"95341\\\",\\\"cvlserv_lmt_rm\\\":0,\\\"wlt_acct_pay\\\":0,\\\"hosp_payf_amt\\\":0,\\\"cla_trt_flag\\\":\\\"1\\\"}\",\"setl_time\":\"2026-08-12 11:22:59\",\"acct_mulaid_pay\":0,\"psn_type\":\"11\",\"psn_name\":\"王晨宇\",\"clr_type\":\"21\",\"fulamt_ownpay_amt\":0,\"med_type\":\"21\",\"cashPayamt\":0,\"mdtrt_cert_no\":\"530000ocvpvqk10ujb26a3720a00009bfc99ea\",\"cvlserv_flag\":\"0\",\"cvlserv_pay\":0,\"insutype\":\"310\",\"enddate\":1785838099000,\"ownpay_hosp_part\":0,\"hosp_part_amt\":0,\"mdtrt_cert_type\":\"01\",\"pool_prop_selfpay\":0,\"naty\":\"01\",\"gend\":\"1\",\"brdy\":\"2000-08-16\",\"balc\":242.38,\"hifdm_pay\":0,\"medfee_sumamt\":89,\"othfund_pay\":0,\"psn_insu_rlts_id\":\"53000000300121343792\",\"insu_admdvs\":\"533199\",\"acct_pay\":89,\"inscp_scp_amt\":81,\"begndate\":1785813000000,\"fund_pay_sumamt\":0},\"originalResult\":{\"respondTime\":\"20260812112259839\",\"infRefmsgid\":\"530000202608121122598204425853\",\"output\":{\"setlinfo\":{\"psn_part_amt\":89,\"hifob_pay\":0,\"age\":25,\"psn_pay\":89,\"preselfpay_amt\":3,\"oth_pay\":0,\"hifp_pay\":0,\"overlmt_selfpay\":5,\"hifes_pay\":0,\"psn_cash_pay\":0,\"maf_pay\":0,\"dedc_std\":600,\"act_pay_dedc\":81,\"inscp_amt\":81,\"mdtrt_id\":\"311996889875\",\"hifmi_pay\":0,\"crt_dedc\":81,\"psn_no\":\"DH5310062846\",\"medins_setl_id\":\"H53310300023202608121122583668\",\"certno\":\"533103200008164016\",\"psn_cert_type\":\"01\",\"exp_content\":\"{\\\"unif_pay_std\\\":0,\\\"unif_pay_blnc\\\":0,\\\"bkst_safeg_amt\\\":0,\\\"fin_subs\\\":null,\\\"care_subs\\\":null,\\\"insu_cmpy_name\\\":\\\"\\\",\\\"comp_sum_amt\\\":null,\\\"comp_dscr\\\":\\\"\\\",\\\"comp_fail_rea\\\":\\\"\\\",\\\"bas_sec_pool_lmt\\\":0,\\\"mihisec_pool_lmt\\\":0,\\\"cvlserv_acct_pay\\\":0,\\\"oth_subs\\\":null,\\\"bas_sev_inpool_amt\\\":0,\\\"mihisec_inpool_amt\\\":0,\\\"third_pay_list\\\":[],\\\"sp_psn_type\\\":\\\"95341\\\",\\\"cvlserv_lmt_rm\\\":0,\\\"wlt_acct_pay\\\":0,\\\"hosp_payf_amt\\\":0,\\\"cla_trt_flag\\\":\\\"1\\\"}\",\"setl_time\":\"2026-08-12 11:22:59\",\"acct_mulaid_pay\":0,\"psn_type\":\"11\",\"psn_name\":\"王晨宇\",\"clr_type\":\"21\",\"fulamt_ownpay_amt\":0,\"med_type\":\"21\",\"cashPayamt\":0,\"mdtrt_cert_no\":\"530000ocvpvqk10ujb26a3720a00009bfc99ea\",\"cvlserv_flag\":\"0\",\"cvlserv_pay\":0,\"insutype\":\"310\",\"enddate\":1785838099000,\"ownpay_hosp_part\":0,\"hosp_part_amt\":0,\"mdtrt_cert_type\":\"01\",\"pool_prop_selfpay\":0,\"naty\":\"01\",\"gend\":\"1\",\"brdy\":\"2000-08-16\",\"balc\":242.38,\"hifdm_pay\":0,\"medfee_sumamt\":89,\"othfund_pay\":0,\"psn_insu_rlts_id\":\"53000000300121343792\",\"insu_admdvs\":\"533199\",\"acct_pay\":89,\"inscp_scp_amt\":81,\"begndate\":1785813000000,\"fund_pay_sumamt\":0},\"setldetail\":[{\"fund_pay_type_name\":\"城镇职工基本医疗保险统筹基金(住院)\",\"crt_payb_lmt_amt\":0,\"fund_pay_type\":\"310100\",\"inscp_scp_amt\":0,\"fund_payamt\":0},{\"fund_pay_type_name\":\"职工大病保险基金\",\"crt_payb_lmt_amt\":0,\"fund_pay_type\":\"99999702\",\"inscp_scp_amt\":0,\"fund_payamt\":0},{\"fund_pay_type_name\":\"城镇职工基本医疗保险个人账户基金\",\"crt_payb_lmt_amt\":89,\"fund_pay_type\":\"310200\",\"inscp_scp_amt\":89,\"fund_payamt\":89}]},\"refmsgTime\":\"20260812112258087\",\"infcode\":0},\"setldetail\":[{\"fund_pay_type_name\":\"城镇职工基本医疗保险统筹基金(住院)\",\"crt_payb_lmt_amt\":0,\"fund_pay_type\":\"310100\",\"inscp_scp_amt\":0,\"fund_payamt\":0},{\"fund_pay_type_name\":\"职工大病保险基金\",\"crt_payb_lmt_amt\":0,\"fund_pay_type\":\"99999702\",\"inscp_scp_amt\":0,\"fund_payamt\":0},{\"fund_pay_type_name\":\"城镇职工基本医疗保险个人账户基金\",\"crt_payb_lmt_amt\":89,\"fund_pay_type\":\"310200\",\"inscp_scp_amt\":89,\"fund_payamt\":89}]}"; // JsonResult result = JsonResult.xmlToBean(xml, JsonResultEnum.SYS_HIS); @@ -124,4 +125,5 @@ public class TestA { // System.out.println(removeIds); // } + } \ No newline at end of file diff --git a/src/main/java/com/ynxbd/common/bean/xk/HisRxAdmRoute.java b/src/main/java/com/ynxbd/common/bean/xk/HisRxDict.java similarity index 86% rename from src/main/java/com/ynxbd/common/bean/xk/HisRxAdmRoute.java rename to src/main/java/com/ynxbd/common/bean/xk/HisRxDict.java index cd3acce..2c86a38 100644 --- a/src/main/java/com/ynxbd/common/bean/xk/HisRxAdmRoute.java +++ b/src/main/java/com/ynxbd/common/bean/xk/HisRxDict.java @@ -5,12 +5,13 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.ToString; -// 给要途径字典 +// HIS字典查询 + @Setter @Getter @ToString @NoArgsConstructor -public class HisRxAdmRoute { +public class HisRxDict { // Code 编码 private String code; // Name 名称 diff --git a/src/main/java/com/ynxbd/common/bean/xk/HisRxPharmDict.java b/src/main/java/com/ynxbd/common/bean/xk/HisRxPharmDict.java deleted file mode 100644 index 08d1537..0000000 --- a/src/main/java/com/ynxbd/common/bean/xk/HisRxPharmDict.java +++ /dev/null @@ -1,18 +0,0 @@ -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; -} diff --git a/src/main/java/com/ynxbd/common/bean/xk/medicalRecipe.java b/src/main/java/com/ynxbd/common/bean/xk/MedInsRxCirc.java similarity index 64% rename from src/main/java/com/ynxbd/common/bean/xk/medicalRecipe.java rename to src/main/java/com/ynxbd/common/bean/xk/MedInsRxCirc.java index 5fb0a82..50694b0 100644 --- a/src/main/java/com/ynxbd/common/bean/xk/medicalRecipe.java +++ b/src/main/java/com/ynxbd/common/bean/xk/MedInsRxCirc.java @@ -7,18 +7,13 @@ import lombok.ToString; import java.io.Serializable; -/** - * @author 李进才 - * @ClassName medicalRecipe - * @Description TODO - * @date 2023/12/04 09:51:00 - */ +// 处方流转 @Setter @Getter @ToString @NoArgsConstructor -public class medicalRecipe implements Serializable { +public class MedInsRxCirc implements Serializable { private String cfNum; private Integer flag; private String msg; diff --git a/src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java b/src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java index 2ba5072..15ab206 100644 --- a/src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java +++ b/src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java @@ -2,7 +2,7 @@ package com.ynxbd.common.dao.his; import com.ynxbd.common.bean.HisRecipe; import com.ynxbd.common.bean.enums.MerchantEnum; -import com.ynxbd.common.bean.xk.medicalRecipe; +import com.ynxbd.common.bean.xk.MedInsRxCirc; import com.ynxbd.common.his.HisConfig; import com.ynxbd.common.his.HisEnum; import com.ynxbd.common.his.HisFactory; @@ -98,7 +98,7 @@ public class HisRecipeDao { } public Result uploadRxMI(String treatNum, String personID, String recipes) { - List resultList = new ArrayList<>(); + List resultList = new ArrayList<>(); JsonResult jsonResult = HisFactory.HisMed(MerchantEnum.WX_MEDICAL).getJsonResult(HisEnum.XK_MEDICAL_RECIPE, params -> { params.put("PersonID", personID); @@ -111,9 +111,9 @@ public class HisRecipeDao { return Result.error(jsonResult.getMessage()); } - List medicalRecipe = jsonResult.getDataMapList(medicalRecipe.class, "CFNums", "Item"); - if (medicalRecipe != null) { - resultList = medicalRecipe; + List dataList = jsonResult.getDataMapList(MedInsRxCirc.class, "CFNums", "Item"); + if (dataList != null) { + resultList = dataList; } return Result.success(resultList); } diff --git a/src/main/java/com/ynxbd/common/dao/his/HisXKDao.java b/src/main/java/com/ynxbd/common/dao/his/HisXKDao.java index 73a3d71..5b866dc 100644 --- a/src/main/java/com/ynxbd/common/dao/his/HisXKDao.java +++ b/src/main/java/com/ynxbd/common/dao/his/HisXKDao.java @@ -1,7 +1,5 @@ package com.ynxbd.common.dao.his; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.ynxbd.common.bean.xk.*; import com.ynxbd.common.helper.common.JsonHelper; import com.ynxbd.common.his.HisEnum; @@ -24,14 +22,23 @@ public class HisXKDao { return jsonResult.getDataMapList(HisRxUseCount.class, "Items", "Item"); } if ("2".equals(type)) { // 给要途径字典 - return jsonResult.getDataMapList(HisRxAdmRoute.class, "Items", "Item"); + return jsonResult.getDataMapList(HisRxDict.class, "Items", "Item"); } if ("3".equals(type)) { // 药房字典 - return jsonResult.getDataMapList(HisRxPharmDict.class, "Items", "Item"); + return jsonResult.getDataMapList(HisRxDict.class, "Items", "Item"); } if ("4".equals(type)) { // 药品 return jsonResult.getDataMapList(HisRxDrug.class, "Items", "Item"); } + if ("5".equals(type)) { // 中医疾病诊断 + return jsonResult.getDataMapList(HisRxDict.class, "Items", "Item"); + } + if ("6".equals(type)) { // 中医证候诊断 + return jsonResult.getDataMapList(HisRxDict.class, "Items", "Item"); + } + if ("7".equals(type)) { // 西医诊断疾病 + return jsonResult.getDataMapList(HisRxDict.class, "Items", "Item"); + } return new ArrayList<>(); } diff --git a/src/main/java/com/ynxbd/common/dao/xk/XKRxDao.java b/src/main/java/com/ynxbd/common/dao/xk/XKRxDao.java new file mode 100644 index 0000000..cf5985d --- /dev/null +++ b/src/main/java/com/ynxbd/common/dao/xk/XKRxDao.java @@ -0,0 +1,6 @@ +package com.ynxbd.common.dao.xk; + + +public class XKRxDao { + +}