From a67bf5d8770fd9401f9ddd2a97cbeb579be587c3 Mon Sep 17 00:00:00 2001 From: wangsq <944414428@qq.com> Date: Tue, 22 Jul 2025 18:05:25 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8C=BB=E4=BF=9D=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=8E=B0=E9=87=91=E9=83=A8=E5=88=86=E6=97=B6=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E5=8C=BB=E4=BF=9D=E9=83=A8=E5=88=86=E5=B7=B2=E9=80=80?= =?UTF-8?q?=E8=B4=B9=EF=BC=8C=E6=A0=87=E8=AF=86=E4=B8=BA=E5=B7=B2=E9=80=80?= =?UTF-8?q?=E8=B4=B9=E3=80=82=202=E3=80=81=E9=83=A8=E5=88=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=9B=E8=A1=8C=E6=95=B0=E6=8D=AE=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ynxbd/common/action/PatientAction.java | 25 +++++++++++-------- .../ynxbd/common/service/HCodeService.java | 2 +- .../ynxbd/common/service/MedicalService.java | 12 ++++++--- .../ynxbd/common/service/RecipeService.java | 2 +- .../com/ynxbd/wx/config/TZReserveConfig.java | 2 +- 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/ynxbd/common/action/PatientAction.java b/src/main/java/com/ynxbd/common/action/PatientAction.java index 39f207a..47f7663 100644 --- a/src/main/java/com/ynxbd/common/action/PatientAction.java +++ b/src/main/java/com/ynxbd/common/action/PatientAction.java @@ -29,12 +29,12 @@ public class PatientAction extends BaseAction { */ @Action("getHisInfoByPatientId") public Result getHisInfoByPatientId(String patientId) { - log.info("[患者]根据patientId查询信息 patientId={}", patientId); + patientId = getDecodeString(patientId); + log.info("[患者]根据patientId查询HIS信息 patientId={}", patientId); if (patientId == null) { return Result.error(ResultEnum.PARAM_IS_BLANK); } try { - patientId = getDecodeString(patientId); JsonResult jsonResult = new HisPatientDao().selectPatientInfo(patientId, "999"); if (!jsonResult.success()) { return Result.error(jsonResult.getMessage()); @@ -59,12 +59,13 @@ public class PatientAction extends BaseAction { */ @Action("getInfoByPatientId") public Result getInfoByPatientId(String patientId) { + patientId = getDecodeString(patientId); log.info("[患者]根据patientId查询信息 patientId={}", patientId); if (patientId == null) { return Result.error(ResultEnum.PARAM_IS_BLANK); } List patients = new PatientDao().selectListByPatientId(patientId); - if (patients.size() == 0) { + if (patients.isEmpty()) { return Result.error(ResultEnum.DATA_NOT_FOUND); } Patient patient = patients.get(0); @@ -112,15 +113,16 @@ public class PatientAction extends BaseAction { /** * [患者] 「外部对接」-根据openId查询患者信息 - * @param openid openId + * + * @param openid openId * @param organizeName 组织机构代码 * @return 返回患者信息 */ @Action("getPatientsByOpenid") - public Result getPatientsByOpenid(String openid,String organizeName) { - log.info("[外部患者信息对接]根据openid查询信息 openid={},organizeName-{}", openid,organizeName); + public Result getPatientsByOpenid(String openid, String organizeName) { + log.info("[外部患者信息对接]根据openid查询信息 openid={},organizeName-{}", openid, organizeName); organizeName = AesHelper.deCode(organizeName); - if(organizeName==null){ + if (organizeName == null) { return Result.error(ResultEnum.PERMISSION_NO_ACCESS); } if (openid == null) { @@ -132,16 +134,17 @@ public class PatientAction extends BaseAction { /** * [患者] 「外部对接」-根据openId加密版查询患者信息 - * @param enParams 加密openId + * + * @param enParams 加密openId * @param organizeName 组织机构代码 * @return 返回患者信息 */ @Action("getPatientsByEncOpenid") - public Result getPatientsByEncOpenid(String enParams,String organizeName) { + public Result getPatientsByEncOpenid(String enParams, String organizeName) { String openid = AesHelper.deCode(enParams); - log.info("[外部患者信息对接]根据openid查询信息 openid={},organizeName-{},emParams-{}", openid,organizeName,enParams); + log.info("[外部患者信息对接]根据openid查询信息 openid={},organizeName-{},emParams-{}", openid, organizeName, enParams); organizeName = AesHelper.deCode(organizeName); - if(organizeName==null){ + if (organizeName == null) { return Result.error(ResultEnum.PERMISSION_NO_ACCESS); } if (openid == null) { diff --git a/src/main/java/com/ynxbd/common/service/HCodeService.java b/src/main/java/com/ynxbd/common/service/HCodeService.java index 84bda98..d3824fe 100644 --- a/src/main/java/com/ynxbd/common/service/HCodeService.java +++ b/src/main/java/com/ynxbd/common/service/HCodeService.java @@ -708,7 +708,7 @@ public class HCodeService { * @param patientId patientId * @return 是否成功 */ - public static boolean payNotifyReportHISData(String openid, String patientId) { + public static boolean rxReportHISData(String openid, String patientId) { try { if (!HCodeService.isEnableHealthCard()) { // 判断是否禁用电子健康卡 return false; diff --git a/src/main/java/com/ynxbd/common/service/MedicalService.java b/src/main/java/com/ynxbd/common/service/MedicalService.java index 92bf9ef..19ba56b 100644 --- a/src/main/java/com/ynxbd/common/service/MedicalService.java +++ b/src/main/java/com/ynxbd/common/service/MedicalService.java @@ -356,7 +356,10 @@ public class MedicalService { } if (cashFee.compareTo(BigDecimal.ZERO) == 0) { // 现金部分为0 - log.info("[医保][挂号]现金为0不执行退费 outTradeNo={}, bankTransNo={}, tradeNo={}", outTradeNo, bankTransNo, tradeNo); + log.info("[医保][挂号]现金为0不执行退费-修改退费状态 outTradeNo={}, bankTransNo={}, tradeNo={}", outTradeNo, bankTransNo, tradeNo); + if (!regDao.updateRefundByTradeNo(tradeNo, "OK")) { + log.info("【微信】[医保][挂号] 修改数据库退费状态失败 tradeNo={}", tradeNo); + } return false; } @@ -463,7 +466,10 @@ public class MedicalService { // 微信医保自动退费 if (cashFee.compareTo(BigDecimal.ZERO) == 0) { // 现金部分为0 - log.info("[医保][处方]现金为0不执行退费 outTradeNo={}, bankTransNo={}, tradeNo={}", outTradeNo, bankTransNo, tradeNo); + log.info("[医保][处方]现金为0不执行退费-修改退费状态 outTradeNo={}, bankTransNo={}, tradeNo={}", outTradeNo, bankTransNo, tradeNo); + if (!recipeDao.updateRefundByTradeNo(tradeNo, "OK")) { + log.info("【微信】[医保][处方]修改数据库退费状态失败 tradeNo={}", tradeNo); + } return false; } MedicalOrder order = WxMedicalHelper.refundCash(outTradeNo, tradeNo, cashFee, "系统繁忙缴费失败，自动退费"); @@ -471,7 +477,7 @@ public class MedicalService { String refundResult = order.isOk() ? WxPayHelper.OK : order.getMessage(); log.info("【微信】[医保][处方]现金自动退费 outTradeNo={}, bankTransNo={}, tradeNo={} [{}]：{}", outTradeNo, bankTransNo, tradeNo, (isOk ? "成功" : "失败"), order.getMessage()); if (!recipeDao.updateRefundByTradeNo(tradeNo, refundResult)) { - log.info("[医保][处方]现金自动退费 修改数据库状态失败 tradeNo={}, refundResult={}", tradeNo, refundResult); + log.info("【微信】[医保][处方]现金自动退费 修改数据库状态失败 tradeNo={}, refundResult={}", tradeNo, refundResult); } return false; } diff --git a/src/main/java/com/ynxbd/common/service/RecipeService.java b/src/main/java/com/ynxbd/common/service/RecipeService.java index 67f495c..e5fff7c 100644 --- a/src/main/java/com/ynxbd/common/service/RecipeService.java +++ b/src/main/java/com/ynxbd/common/service/RecipeService.java @@ -379,7 +379,7 @@ public class RecipeService { TZReserveConfig.reserveRun(patientId); // 天助医技预约 - HCodeService.payNotifyReportHISData(openid, patientId); + HCodeService.rxReportHISData(openid, patientId); return true; } diff --git a/src/main/java/com/ynxbd/wx/config/TZReserveConfig.java b/src/main/java/com/ynxbd/wx/config/TZReserveConfig.java index 5ece35c..94c6e86 100644 --- a/src/main/java/com/ynxbd/wx/config/TZReserveConfig.java +++ b/src/main/java/com/ynxbd/wx/config/TZReserveConfig.java @@ -25,7 +25,7 @@ import java.util.Map; * 天助平台配置 * * @author 李进才 - * @ClassName MeTechnologyReConfig + * @ClassName TZReserveConfig * @Description TODO * @date 2024/06/14 09:27:00 */