diff --git a/src/main/java/com/ynxbd/common/action/AuthAgentAction.java b/src/main/java/com/ynxbd/common/action/AuthAgentAction.java
index f2b1d2f..76d8fb0 100644
--- a/src/main/java/com/ynxbd/common/action/AuthAgentAction.java
+++ b/src/main/java/com/ynxbd/common/action/AuthAgentAction.java
@@ -2,6 +2,7 @@ package com.ynxbd.common.action;
 
 import com.ynxbd.common.action.base.BaseAction;
 import com.ynxbd.common.bean.his.HisAuthAgent;
+import com.ynxbd.common.config.interceptor.AesDecode;
 import com.ynxbd.common.dao.his.HisAuthAgentDao;
 import com.ynxbd.common.helper.common.ParamHelper;
 import com.ynxbd.common.result.Result;
@@ -23,9 +24,8 @@ public class AuthAgentAction extends BaseAction {
 
 
     @Action("getAuthAgent")
-    public Result getAuthAgent(String treatNum, Integer treatType, String itemNo) {
+    public Result getAuthAgent(@AesDecode String treatNum, Integer treatType, String itemNo) {
         try {
-            treatNum = decodeReqString(treatNum);
             log.info("[委托人信息]查询 treatNum={}, treatType={}", treatNum, treatType);
             if (!ObjectUtils.isEmpty(itemNo)) {
                 itemNo = decodeReqString(itemNo);
@@ -33,6 +33,7 @@ public class AuthAgentAction extends BaseAction {
                     return Result.error(ResultEnum.PARAM_IS_INVALID);
                 }
             }
+
             List<HisAuthAgent> dataList = new HisAuthAgentDao().queryAuthAgent(treatNum, treatType);
 
             boolean hasItemNo = !ObjectUtils.isEmpty(itemNo);
@@ -57,9 +58,8 @@ public class AuthAgentAction extends BaseAction {
     }
 
     @Action("addAuthAgent")
-    public Result addAuthAgent(String openid, String treatNum, Integer treatType, String personName, String personSex, String personTel, String personId, String relationship, Integer personAge, String personAddress) {
+    public Result addAuthAgent(String openid, @AesDecode String treatNum, Integer treatType, String personName, String personSex, String personTel, String personId, String relationship, Integer personAge, String personAddress) {
         try {
-            treatNum = decodeReqString(treatNum);
             log.info("[委托人信息]添加 treatNum={}, treatType={}, personName={}, personSex={}, relationship={}", treatNum, treatType, personName, personSex, relationship);
             new HisAuthAgentDao().addAuthAgent(treatNum, treatType, personName, personSex, personTel, personId, relationship, personAge, personAddress);
             return Result.success();
@@ -69,12 +69,11 @@ public class AuthAgentAction extends BaseAction {
     }
 
     @Action("updateAuthAgent")
-    public Result updateAuthAgent(String openid, String itemNo, String personName, String personSex, String personTel, String personId, String relationship, String personAge, String personAddress, String enPersonTel, String enPersonId) {
+    public Result updateAuthAgent(String openid, @AesDecode String itemNo, String personName, String personSex, String personTel, String personId, String relationship, String personAge, String personAddress, String enPersonTel, String enPersonId) {
         try {
             if (personId == null || personTel == null || enPersonTel == null || enPersonId == null) {
                 return Result.error(ResultEnum.PARAM_IS_INVALID);
             }
-            itemNo = decodeReqString(itemNo);
             log.info("[委托人信息]添加 itemNo={},personName={}, personSex={}, relationship={}, enPersonTel={}, enPersonId={}", itemNo, personName, personSex, relationship, enPersonTel, enPersonId);
             if (personId.contains("*")) { // 数据没有变化
                 personId = decodeReqString(enPersonId);
@@ -94,9 +93,8 @@ public class AuthAgentAction extends BaseAction {
 
 
     @Action("delAuthAgent")
-    public Result delAuthAgent(String itemNo, String openid) {
+    public Result delAuthAgent(@AesDecode String itemNo, String openid) {
         try {
-            itemNo = decodeReqString(itemNo);
             log.info("[委托人信息]修改 itemNo={}", itemNo);
             new HisAuthAgentDao().delAuthAgent(itemNo);
             return Result.success();
diff --git a/src/main/java/com/ynxbd/common/action/ChronicAction.java b/src/main/java/com/ynxbd/common/action/ChronicAction.java
index 10eafeb..1650a06 100644
--- a/src/main/java/com/ynxbd/common/action/ChronicAction.java
+++ b/src/main/java/com/ynxbd/common/action/ChronicAction.java
@@ -27,7 +27,7 @@ import java.sql.SQLException;
 public class ChronicAction extends BaseAction {
 
     @Action("upload")
-    public Result Upload(String applyName, String reserveTime, String patientId, String openId, String idcard, String treatId, Integer patientType, String diagProve, String idcardFont, String idcardBack, String inHospProve, String chronicName, String chronicCode, String phone, String address) throws SQLException {
+    public Result upload(String applyName, String reserveTime, String patientId, String openId, String idcard, String treatId, Integer patientType, String diagProve, String idcardFont, String idcardBack, String inHospProve, String chronicName, String chronicCode, String phone, String address) throws SQLException {
         log.info("[慢病预约] applyName-{}, reserveTime-{}, patientId-{}, openId-{}, idcard-{}, treatId-{}, patientType-{}, chronicName-{}, chronicCode-{}, phone-{}, address-{}",
                 applyName, reserveTime, patientId, openId, idcard, treatId, patientType, chronicName, chronicCode, phone, address);
         if (applyName == null || patientId == null || openId == null || idcard == null || treatId == null || patientType == null) {
@@ -59,7 +59,7 @@ public class ChronicAction extends BaseAction {
     }
 
     @Action("listByPatientId")
-    public Result ListByPatientId(String patientId) {
+    public Result listByPatientId(String patientId) {
         log.info("[慢病预约]-获取列表 patientId-{}", patientId);
         if (patientId == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
diff --git a/src/main/java/com/ynxbd/common/action/HealthCodeAction.java b/src/main/java/com/ynxbd/common/action/HealthCodeAction.java
index 14601c3..b8f9805 100644
--- a/src/main/java/com/ynxbd/common/action/HealthCodeAction.java
+++ b/src/main/java/com/ynxbd/common/action/HealthCodeAction.java
@@ -8,6 +8,7 @@ import com.ynxbd.common.bean.User;
 import com.ynxbd.common.bean.enums.HCardTypeEnum;
 import com.ynxbd.common.bean.enums.HealthCardEnum;
 import com.ynxbd.common.bean.enums.HealthCardRespCodeEnum;
+import com.ynxbd.common.config.interceptor.AesDecode;
 import com.ynxbd.common.dao.PatientDao;
 import com.ynxbd.common.dao.his.HisPatientDao;
 import com.ynxbd.common.helper.common.DateHelper;
@@ -167,8 +168,7 @@ public class HealthCodeAction extends BaseAction {
      * @param healthCardId 健康卡id
      */
     @Action("reportHISData")
-    public Result reportHISData(String scene, String openid, String idCardNo, String healthCardId) {
-        idCardNo = decodeReqString(idCardNo);
+    public Result reportHISData(String scene, String openid, @AesDecode String idCardNo, String healthCardId) {
         if (scene == null || openid == null || healthCardId == null || idCardNo == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
diff --git a/src/main/java/com/ynxbd/common/action/InHospAction.java b/src/main/java/com/ynxbd/common/action/InHospAction.java
index 721aa1f..d8b0ed5 100644
--- a/src/main/java/com/ynxbd/common/action/InHospAction.java
+++ b/src/main/java/com/ynxbd/common/action/InHospAction.java
@@ -2,6 +2,7 @@ package com.ynxbd.common.action;
 
 import com.ynxbd.common.action.base.BaseAction;
 import com.ynxbd.common.bean.in_hosp.*;
+import com.ynxbd.common.config.interceptor.AesDecode;
 import com.ynxbd.common.dao.his.HisInHospDao;
 import com.ynxbd.common.helper.common.DateHelper;
 import com.ynxbd.common.result.JsonResult;
@@ -37,8 +38,7 @@ public class InHospAction extends BaseAction {
      * @param patientId 患者id
      */
     @Action("getPreMoneyList")
-    public Result getPreMoneyList(String begDate, String endDate, String patientId) {
-        patientId = decodeReqString(patientId);
+    public Result getPreMoneyList(String begDate, String endDate, @AesDecode String patientId) {
         log.info("[住院]预交金缴费记录查询, patientId={}", patientId);
         if (patientId == null || begDate == null || endDate == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
@@ -73,9 +73,8 @@ public class InHospAction extends BaseAction {
      * @param patientId 患者id
      */
     @Action("getInHospSumFee")
-    public Result getInHospSumFee(String date, String patientId) {
+    public Result getInHospSumFee(String date, @AesDecode String patientId) {
         log.info("[住院]查询住院日费用汇总 patientId={}, date={}", patientId, date);
-        patientId = decodeReqString(patientId);
         if (patientId == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
@@ -107,9 +106,8 @@ public class InHospAction extends BaseAction {
      * @param patientId 患者id
      */
     @Action("getInHospFee")
-    public Result getInHospFee(String date, String patientId) {
+    public Result getInHospFee(String date, @AesDecode String patientId) {
         log.info("[住院]查询住院费用清单 patientId={}, date={}", patientId, date);
-        patientId = decodeReqString(patientId);
         if (patientId == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
@@ -148,8 +146,7 @@ public class InHospAction extends BaseAction {
      * @param treatNum 住院号
      */
     @Action("getInHospByTreatNum")
-    public Result getInHospByTreatNum(String treatNum) {
-        treatNum = decodeReqString(treatNum);
+    public Result getInHospByTreatNum(@AesDecode String treatNum) {
         log.info("[住院]通过住院号查询患者信息(含预交金) treatNum={}", treatNum);
         if (treatNum == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
@@ -176,8 +173,7 @@ public class InHospAction extends BaseAction {
      * @param inHospState { 0 | null 查询所有；1:只查询在院记录； }
      */
     @Action("getInHospByPatientId")
-    public Result getInHospByPatientId(String patientId, String begDate, String endDate, String inHospState) {
-        patientId = decodeReqString(patientId);
+    public Result getInHospByPatientId(@AesDecode String patientId, String begDate, String endDate, String inHospState) {
         log.info("[住院]通过患者ID查询在院患者信息 patientId={}, endDate={}, endDate={}", patientId, begDate, endDate);
         if (patientId == null || begDate == null || endDate == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
@@ -225,8 +221,7 @@ public class InHospAction extends BaseAction {
      * @return 住院记录
      */
     @Action("getHospListByPatientId")
-    public Result getHospListByPatientId(String patientId) {
-        patientId = decodeReqString(patientId);
+    public Result getHospListByPatientId(@AesDecode String patientId) {
         log.info("[住院]通过患者ID查询住院记录 patientId-{}", patientId);
         if (patientId == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
@@ -249,8 +244,7 @@ public class InHospAction extends BaseAction {
      * @return 费用明细
      */
     @Action("getAllFeeByTreat")
-    public Result getAllFeeByTreat(String treatNum) {
-        treatNum = decodeReqString(treatNum);
+    public Result getAllFeeByTreat(@AesDecode String treatNum) {
         log.info("[住院]通过住院号查询所有费用明细  treatNum-{}", treatNum);
         if (treatNum == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
diff --git a/src/main/java/com/ynxbd/common/action/MeTechnologyReAction.java b/src/main/java/com/ynxbd/common/action/MeTechnologyReAction.java
index e3749f5..f550e9d 100644
--- a/src/main/java/com/ynxbd/common/action/MeTechnologyReAction.java
+++ b/src/main/java/com/ynxbd/common/action/MeTechnologyReAction.java
@@ -1,6 +1,7 @@
 package com.ynxbd.common.action;
 
 import com.ynxbd.common.action.base.BaseAction;
+import com.ynxbd.common.config.interceptor.AesDecode;
 import com.ynxbd.common.result.Result;
 import com.ynxbd.common.result.ResultEnum;
 import com.ynxbd.wx.config.TZReserveConfig;
@@ -28,12 +29,11 @@ public class MeTechnologyReAction extends BaseAction {
      * @return 结果
      */
     @Action("getCanBookOrders")
-    public Result getCanBookOrders(String patientId, String startDate, String endDate) {
+    public Result getCanBookOrders(@AesDecode String patientId, String startDate, String endDate) {
         log.info("[天助预约平台接口参数]获取可预约的订单 patientId={},startDate={},endDate={}", patientId, startDate, endDate);
         if (startDate == null || endDate == null || patientId == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
-        patientId = decodeReqString(patientId);
         return TZReserveConfig.getCanBookOrders(patientId, startDate, endDate);
     }
 
@@ -48,12 +48,11 @@ public class MeTechnologyReAction extends BaseAction {
      * @return 结果
      */
     @Action("getNumberSourceStatistics")
-    public Result getNumberSourceStatistics(String patientId, String startDate, String endDate, String docDetailedNo, String intervalTimeType) {
+    public Result getNumberSourceStatistics(@AesDecode String patientId, String startDate, String endDate, String docDetailedNo, String intervalTimeType) {
         log.info("[天助预约平台接口参数]获取号源统计信息 patientId={},startDate={},endDate={},docDetailedNo={},intervalTimeType={}", patientId, startDate, endDate, docDetailedNo, intervalTimeType);
         if (patientId == null || startDate == null || endDate == null || docDetailedNo == null || intervalTimeType == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
-        patientId = decodeReqString(patientId);
         return TZReserveConfig.getNumberSourceStatistics(patientId, startDate, endDate, docDetailedNo, intervalTimeType);
     }
 
@@ -107,12 +106,11 @@ public class MeTechnologyReAction extends BaseAction {
      * @return 结果
      */
     @Action("getBookedDateTime")
-    public Result getBookedDateTime(String appFormID, String examRoomOrQueue, String beginDateTime, String endDateTime, String patientId, String patientName) {
+    public Result getBookedDateTime(String appFormID, String examRoomOrQueue, String beginDateTime, String endDateTime, @AesDecode String patientId, String patientName) {
         log.info("[天助预约平台接口参数]确定改约 appFormId={},examRoomOrQueue={},beginDateTime={},endDateTime={},patientId={},patientName={}", appFormID, examRoomOrQueue, beginDateTime, endDateTime, patientId, patientName);
         if (appFormID == null || examRoomOrQueue == null || beginDateTime == null || endDateTime == null || patientId == null || patientName == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
-        patientId = decodeReqString(patientId);
         return TZReserveConfig.getBookedDateTime(appFormID, examRoomOrQueue, beginDateTime, endDateTime, patientId, patientName);
     }
 
diff --git a/src/main/java/com/ynxbd/common/action/MedToolAction.java b/src/main/java/com/ynxbd/common/action/MedToolAction.java
index 9de4f8d..89899e9 100644
--- a/src/main/java/com/ynxbd/common/action/MedToolAction.java
+++ b/src/main/java/com/ynxbd/common/action/MedToolAction.java
@@ -1,6 +1,7 @@
 package com.ynxbd.common.action;
 
 import com.ynxbd.common.action.base.BaseAction;
+import com.ynxbd.common.config.interceptor.AesDecode;
 import com.ynxbd.common.result.Result;
 import com.ynxbd.common.result.ResultEnum;
 import com.ynxbd.common.service.MedToolService;
@@ -16,13 +17,12 @@ public class MedToolAction extends BaseAction {
      * [就医助手]修改流程标记
      */
     @Action("saveMedToolMarkByTreatNum")
-    public Result saveMedToolMarkByTreatNum(String treatNum, Integer type, String processMark) {
-        treatNum = decodeReqString(treatNum);
-        log.info("[就医助手]根据就诊号修改流程标记 treatNum={}, type={}, processMark={}", treatNum, type, processMark);
-        if (ObjectUtils.isEmpty(treatNum) || processMark == null) {
-            return Result.error(ResultEnum.PARAM_IS_DEFECT);
-        }
+    public Result saveMedToolMarkByTreatNum(@AesDecode String treatNum, Integer type, String processMark) {
         try {
+            log.info("[就医助手]根据就诊号修改流程标记 treatNum={}, type={}, processMark={}", treatNum, type, processMark);
+            if (ObjectUtils.isEmpty(treatNum) || processMark == null) {
+                return Result.error(ResultEnum.PARAM_IS_DEFECT);
+            }
             boolean isOK = new MedToolService().saveMedToolMarkByTreatNum(treatNum, type, processMark);
             return Result.isOK(isOK);
         } catch (Exception e) {
diff --git a/src/main/java/com/ynxbd/common/action/PatientAction.java b/src/main/java/com/ynxbd/common/action/PatientAction.java
index ae7fc85..183b972 100644
--- a/src/main/java/com/ynxbd/common/action/PatientAction.java
+++ b/src/main/java/com/ynxbd/common/action/PatientAction.java
@@ -4,6 +4,7 @@ import com.ynxbd.common.action.base.BaseAction;
 import com.ynxbd.common.bean.Patient;
 import com.ynxbd.common.bean.PatientLink;
 import com.ynxbd.common.bean.enums.HCardTypeEnum;
+import com.ynxbd.common.config.interceptor.AesDecode;
 import com.ynxbd.common.dao.PatientDao;
 import com.ynxbd.common.dao.his.HisPatientDao;
 import com.ynxbd.common.helper.common.*;
@@ -28,8 +29,7 @@ public class PatientAction extends BaseAction {
      * [患者]根据patientId查询信息
      */
     @Action("getHisInfoByPatientId")
-    public Result getHisInfoByPatientId(String patientId) {
-        patientId = decodeReqString(patientId);
+    public Result getHisInfoByPatientId(@AesDecode String patientId) {
         log.info("[患者]根据patientId查询HIS信息 patientId={}", patientId);
         if (patientId == null) {
             return Result.error(ResultEnum.PARAM_IS_BLANK);
@@ -58,8 +58,7 @@ public class PatientAction extends BaseAction {
      * [患者]根据patientId查询信息
      */
     @Action("getInfoByPatientId")
-    public Result getInfoByPatientId(String patientId) {
-        patientId = decodeReqString(patientId);
+    public Result getInfoByPatientId(@AesDecode String patientId) {
         log.info("[患者]根据patientId查询信息 patientId={}", patientId);
         if (patientId == null) {
             return Result.error(ResultEnum.PARAM_IS_BLANK);
diff --git a/src/main/java/com/ynxbd/common/action/RecipeAction.java b/src/main/java/com/ynxbd/common/action/RecipeAction.java
index 233adf0..263263b 100644
--- a/src/main/java/com/ynxbd/common/action/RecipeAction.java
+++ b/src/main/java/com/ynxbd/common/action/RecipeAction.java
@@ -6,6 +6,7 @@ import com.ynxbd.common.bean.NatRecord;
 import com.ynxbd.common.bean.Patient;
 import com.ynxbd.common.bean.enums.MerchantEnum;
 import com.ynxbd.common.bean.pay.Recipe;
+import com.ynxbd.common.config.interceptor.AesDecode;
 import com.ynxbd.common.dao.NatRecordDao;
 import com.ynxbd.common.dao.PatientDao;
 import com.ynxbd.common.dao.his.HisRecipeDao;
@@ -43,9 +44,8 @@ public class RecipeAction extends BaseAction {
      * 获取已缴费项目
      */
     @Action("getPayedList")
-    public Result getPayedList(String patientId, String personNo, String begDate, String endDate) {
+    public Result getPayedList(@AesDecode String patientId, String personNo, String begDate, String endDate) {
         log.info("[处方]已缴费项目查询 patientId={}, begDate={}, endDate={}, personNo-{}", patientId, begDate, endDate, personNo);
-        patientId = decodeReqString(patientId);
         if (patientId == null || begDate == null || endDate == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
@@ -58,9 +58,8 @@ public class RecipeAction extends BaseAction {
      * 查询已缴费项目
      */
     @Action("getRxPaidList")
-    public Result getRxPaidList(String patientId, String personNo, String begDate, String endDate) {
+    public Result getRxPaidList(@AesDecode String patientId, String personNo, String begDate, String endDate) {
         log.info("[处方]查询已缴费项目 patientId={}, begDate={}, endDate={}, personNo-{}", patientId, begDate, endDate, personNo);
-        patientId = decodeReqString(patientId);
         if (patientId == null || begDate == null || endDate == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
@@ -81,9 +80,8 @@ public class RecipeAction extends BaseAction {
      * 获取未缴费项目
      */
     @Action("getRxUnPayList")
-    public Result getRxUnPayList(String patientId, String personNo, String begDate, String endDate) {
+    public Result getRxUnPayList(@AesDecode String patientId, String personNo, String begDate, String endDate) {
         log.info("[处方]未缴费项目查询 patientId={}, personNo={}, begDate={}, endDate={}", patientId, personNo, begDate, endDate);
-        patientId = decodeReqString(patientId);
         if (patientId == null || begDate == null || endDate == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
@@ -112,9 +110,8 @@ public class RecipeAction extends BaseAction {
      * 获取未缴费项目（旧）
      */
     @Action("getUnPayList")
-    public Result getUnPayList(String patientId, String personNo, String begDate, String endDate) {
+    public Result getUnPayList(@AesDecode String patientId, String personNo, String begDate, String endDate) {
         log.info("[处方]未缴费项目查询 patientId={}, personNo={}, begDate={}, endDate={}", patientId, personNo, begDate, endDate);
-        patientId = decodeReqString(patientId);
         if (patientId == null || begDate == null || endDate == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
@@ -140,9 +137,8 @@ public class RecipeAction extends BaseAction {
      * @param endDate   结束时间
      */
     @Action("getOLRxList")
-    public Result getOLRxList(String patientId, String begDate, String endDate) {
+    public Result getOLRxList(@AesDecode String patientId, String begDate, String endDate) {
         log.info("[处方]未缴费项目查询 patientId={}", patientId);
-        patientId = decodeReqString(patientId);
         if (patientId == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
@@ -180,8 +176,7 @@ public class RecipeAction extends BaseAction {
      * @param invoiceNo 发票号
      */
     @Action("getRxInvoiceInfo")
-    public Result getRxInvoiceInfo(String invoiceNo) {
-        invoiceNo = decodeReqString(invoiceNo);
+    public Result getRxInvoiceInfo(@AesDecode String invoiceNo) {
         log.info("[处方]查询发票 invoiceNo={} ", invoiceNo);
         if (invoiceNo == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
@@ -190,8 +185,6 @@ public class RecipeAction extends BaseAction {
     }
 
 
-
-
     /**
      * 预约体检his缴费
      *
diff --git a/src/main/java/com/ynxbd/common/action/RegisterAction.java b/src/main/java/com/ynxbd/common/action/RegisterAction.java
index ca9d92d..e40f128 100644
--- a/src/main/java/com/ynxbd/common/action/RegisterAction.java
+++ b/src/main/java/com/ynxbd/common/action/RegisterAction.java
@@ -54,7 +54,6 @@ public class RegisterAction extends BaseAction {
     @Action("getDeptInfo")
     public Result getDeptInfo(String deptCode) {
         log.info("[科室]获取科室信息 deptCode={}", deptCode);
-
         if (deptCode == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
diff --git a/src/main/java/com/ynxbd/common/action/SelfHelpAction.java b/src/main/java/com/ynxbd/common/action/SelfHelpAction.java
index 6f4ec28..bf3031d 100644
--- a/src/main/java/com/ynxbd/common/action/SelfHelpAction.java
+++ b/src/main/java/com/ynxbd/common/action/SelfHelpAction.java
@@ -2,6 +2,7 @@ package com.ynxbd.common.action;
 
 import com.ynxbd.common.action.base.BaseAction;
 import com.ynxbd.common.bean.his.HisSelfHelpInfo;
+import com.ynxbd.common.config.interceptor.AesDecode;
 import com.ynxbd.common.dao.his.HisSelfHelpDao;
 import com.ynxbd.common.result.Result;
 import com.ynxbd.common.result.ResultEnum;
@@ -35,10 +36,9 @@ public class SelfHelpAction extends BaseAction {
      * HIS创建自助开单
      */
     @Action("createHisSelfHelp")
-    public Result createHisSelfHelp(String patientId, String items) {
+    public Result createHisSelfHelp(@AesDecode String patientId, String items) {
         try {
-            log.info("[HIS创建自助开单]");
-            patientId = decodeReqString(patientId);
+            log.info("[HIS创建自助开单] patientId={}", patientId);
             if (ObjectUtils.isEmpty(patientId) || ObjectUtils.isEmpty(items)) {
                 return Result.error(ResultEnum.PARAM_IS_DEFECT);
             }
diff --git a/src/main/java/com/ynxbd/common/action/ServiceAction.java b/src/main/java/com/ynxbd/common/action/ServiceAction.java
index 240632e..bb55a91 100644
--- a/src/main/java/com/ynxbd/common/action/ServiceAction.java
+++ b/src/main/java/com/ynxbd/common/action/ServiceAction.java
@@ -20,6 +20,7 @@ import com.ynxbd.common.result.ResultEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
+
 import java.util.List;
 
 
@@ -28,9 +29,9 @@ import java.util.List;
 public class ServiceAction extends BaseAction {
 
     @Action("accounts")
-    public Result accounts(String begDate, String endDate ) {
-        log.info("笔次、费用统计：" + begDate + " 至 " + endDate);
-        if (begDate == null || endDate == null){
+    public Result accounts(String begDate, String endDate) {
+        log.info("笔次、费用统计：{} 至 {}", begDate, endDate);
+        if (begDate == null || endDate == null) {
             return Result.error(ResultEnum.PARAM_IS_BLANK);
         }
 
diff --git a/src/main/java/com/ynxbd/common/action/SmsAction.java b/src/main/java/com/ynxbd/common/action/SmsAction.java
index 1577c0b..25d6901 100644
--- a/src/main/java/com/ynxbd/common/action/SmsAction.java
+++ b/src/main/java/com/ynxbd/common/action/SmsAction.java
@@ -67,7 +67,7 @@ public class SmsAction extends BaseAction {
 
     @Action("codeVerify")
     public Result codeVerify(String tel, String code) {
-        log.info("[短信验证]tel={} ,code={}", tel, code);
+        log.info("[短信验证]tel={}, code={}", tel, code);
         if (tel == null || tel.length() != 11) {
             return Result.error(ResultEnum.SMS_TEL_ERROR);
         }
diff --git a/src/main/java/com/ynxbd/common/action/TreatAction.java b/src/main/java/com/ynxbd/common/action/TreatAction.java
index c001fce..753cd16 100644
--- a/src/main/java/com/ynxbd/common/action/TreatAction.java
+++ b/src/main/java/com/ynxbd/common/action/TreatAction.java
@@ -3,6 +3,7 @@ package com.ynxbd.common.action;
 
 import com.ynxbd.common.action.base.BaseAction;
 import com.ynxbd.common.bean.his.HisTreat;
+import com.ynxbd.common.config.interceptor.AesDecode;
 import com.ynxbd.common.dao.his.HisTreatDao;
 import com.ynxbd.common.helper.common.AesMicroHelper;
 import com.ynxbd.common.result.JsonResult;
@@ -24,8 +25,7 @@ import java.util.stream.Collectors;
 public class TreatAction extends BaseAction {
 
     @Action("getTreatList")
-    public Result getTreatList(String patientId, String deptCode, Boolean isSCD) {
-        patientId = decodeReqString(patientId);
+    public Result getTreatList(@AesDecode String patientId, String deptCode, Boolean isSCD) {
         log.info("[就诊记录]查询 patientId={}, deptCode={}, isSCD={}", patientId, deptCode, isSCD);
         if (patientId == null || deptCode == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
@@ -105,9 +105,8 @@ public class TreatAction extends BaseAction {
     }
 
     @Action("getInfoByTreatNum")
-    public Result getInfoByTreatNum(String treatNum) {
+    public Result getInfoByTreatNum(@AesDecode String treatNum) {
         try {
-            treatNum = decodeReqString(treatNum);
             if (treatNum == null) {
                 return Result.error(ResultEnum.PARAM_IS_BLANK);
             }
@@ -124,9 +123,8 @@ public class TreatAction extends BaseAction {
     }
 
     @Action("getDoctCaSign")
-    public Result getDoctCaSign(String doctCode) {
+    public Result getDoctCaSign(@AesDecode String doctCode) {
         try {
-            doctCode = decodeReqString(doctCode);
             if (ObjectUtils.isEmpty(doctCode)) {
                 return Result.error(ResultEnum.PARAM_IS_INVALID);
             }
diff --git a/src/main/java/com/ynxbd/common/action/XBDAction.java b/src/main/java/com/ynxbd/common/action/XBDAction.java
index 385c54e..71fc439 100644
--- a/src/main/java/com/ynxbd/common/action/XBDAction.java
+++ b/src/main/java/com/ynxbd/common/action/XBDAction.java
@@ -83,15 +83,14 @@ public class XBDAction extends BaseAction {
      * @return 可以翻拍的病历列表
      */
     @Action("getMedicalRecordList")
-    public Result getMedicalRecordList(String patientId, Integer flagSh) {
+    public Result getMedicalRecordList(@AesDecode String patientId, Integer flagSh) {
         try {
-            String realPatientId = decodeReqString(patientId);
-            log.info("[病案]获取该病人已归档可以翻拍的病历 patientId={}", realPatientId);
-            if (ObjectUtils.isEmpty(realPatientId)) {
+            log.info("[病案]获取该病人已归档可以翻拍的病历 patientId={}", patientId);
+            if (patientId == null) {
                 return Result.error(ResultEnum.PARAM_IS_DEFECT);
             }
             String resp = XBDHttpHelper.ExecMethodPost(XBDEnum.BLSM_Appointment_GetBA.Name, params -> {
-                params.put("patientID", realPatientId);
+                params.put("patientID", patientId);
                 params.put("flagFP", 0);
                 params.put("flagSH", flagSh);
             });
@@ -284,9 +283,8 @@ public class XBDAction extends BaseAction {
      * 生成token // 德宏体检看pacs报告
      */
     @Action("getPeisByCardNo")
-    public Result getPeisByCardNo(String cardNo, String begDate, String endDate) {
-        log.info("[查询体检记录]  cardNo={}", cardNo);
-        cardNo = decodeReqString(cardNo);
+    public Result getPeisByCardNo(@AesDecode String cardNo, String begDate, String endDate) {
+        log.info("[查询体检记录] cardNo={}, begDate={}, endDate={}", cardNo, begDate, endDate);
         if (ObjectUtils.isEmpty(cardNo) || ObjectUtils.isEmpty(begDate) || ObjectUtils.isEmpty(endDate)) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
diff --git a/src/main/java/com/ynxbd/common/action/pay/MedicalAction.java b/src/main/java/com/ynxbd/common/action/pay/MedicalAction.java
index 0030d61..0133c0a 100644
--- a/src/main/java/com/ynxbd/common/action/pay/MedicalAction.java
+++ b/src/main/java/com/ynxbd/common/action/pay/MedicalAction.java
@@ -105,11 +105,7 @@ public class MedicalAction extends BaseAction {
      * [处方流转]获取授权链接
      */
     @Action("getAuthUrl")
-    public Result getAuthUrl(String url) {
-        if (ObjectUtils.isEmpty(url)) {
-            return Result.error(ResultEnum.PARAM_IS_INVALID);
-        }
-        url = decodeReqString(url);
+    public Result getAuthUrl(@AesDecode String url) {
         if (ObjectUtils.isEmpty(url)) {
             return Result.error(ResultEnum.PARAM_IS_INVALID);
         }
diff --git a/src/main/java/com/ynxbd/common/action/pay/MedicalTestAction.java b/src/main/java/com/ynxbd/common/action/pay/MedicalTestAction.java
index 2b5163b..b03f35e 100644
--- a/src/main/java/com/ynxbd/common/action/pay/MedicalTestAction.java
+++ b/src/main/java/com/ynxbd/common/action/pay/MedicalTestAction.java
@@ -3,6 +3,7 @@ package com.ynxbd.common.action.pay;
 import com.ynxbd.ali.config.AliMIConfig;
 import com.ynxbd.common.action.base.BaseAction;
 import com.ynxbd.common.bean.HisRecipe;
+import com.ynxbd.common.config.interceptor.AesDecode;
 import com.ynxbd.common.dao.his.HisMedicalTestDao;
 import com.ynxbd.common.helper.common.DateHelper;
 import com.ynxbd.common.result.Result;
@@ -31,9 +32,8 @@ public class MedicalTestAction extends BaseAction {
      * 获取未缴费项目
      */
     @Action("getDevRxUnPayList")
-    public Result getDevRxUnPayList(String patientId, String begDate, String endDate) {
+    public Result getDevRxUnPayList(@AesDecode String patientId, String begDate, String endDate) {
         log.info("[处方Dev]未缴费项目查询 patientId={}, begDate={}, endDate={}", patientId, begDate, endDate);
-        patientId = decodeReqString(patientId);
         if (patientId == null || begDate == null || endDate == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
@@ -59,9 +59,8 @@ public class MedicalTestAction extends BaseAction {
      * 获取未缴费项目
      */
     @Action("getDevRxPaidList")
-    public Result getDevRxPaidList(String patientId, String begDate, String endDate) {
+    public Result getDevRxPaidList(@AesDecode String patientId, String begDate, String endDate) {
         log.info("[处方Dev]已缴费项目查询 patientId={}, begDate={}, endDate={}", patientId, begDate, endDate);
-        patientId = decodeReqString(patientId);
         if (patientId == null || begDate == null || endDate == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
diff --git a/src/main/java/com/ynxbd/common/action/report/LisReportAction.java b/src/main/java/com/ynxbd/common/action/report/LisReportAction.java
index a29c9b3..8f59ff0 100644
--- a/src/main/java/com/ynxbd/common/action/report/LisReportAction.java
+++ b/src/main/java/com/ynxbd/common/action/report/LisReportAction.java
@@ -16,6 +16,7 @@ import com.ynxbd.common.bean.lis.XBDLisBactResult;
 import com.ynxbd.common.bean.lis.XBDLisImageResult;
 import com.ynxbd.common.bean.lis.XBDLisReport;
 import com.ynxbd.common.bean.lis.XBDLisResult;
+import com.ynxbd.common.config.interceptor.AesDecode;
 import com.ynxbd.common.dao.lis.RMLisDao;
 import com.ynxbd.common.dao.lis.XBDLisDao;
 import com.ynxbd.common.helper.common.Base64Helper;
@@ -49,8 +50,7 @@ public class LisReportAction extends BaseAction {
      * @return 报告列表
      */
     @Action("report")
-    public Result getReportList(String treatNum, String treatNumPrefix, String flag, String patientType, String startTime, String endTime) {
-        treatNum = decodeReqString(treatNum);
+    public Result getReportList(@AesDecode String treatNum, String treatNumPrefix, String flag, String patientType, String startTime, String endTime) {
         log.info("[Lis报告单]查询: flag={{}}, treatNumPrefix={{}}, treatNum={{}}, patientType={{}}", flag, treatNumPrefix, treatNum, patientType);
         if (flag == null || patientType == null || treatNum == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
@@ -129,10 +129,7 @@ public class LisReportAction extends BaseAction {
      * 普通报告
      */
     @Action("result")
-    public Result getResult(String reportId, String sampleCode, String flag, String testDate, String openid) {
-        reportId = decodeReqString(reportId);
-        sampleCode = decodeReqString(sampleCode);
-
+    public Result getResult(@AesDecode String reportId, @AesDecode String sampleCode, String flag, String testDate, String openid) {
         log.info("[Lis结果]查询: flag={{}}, reportId={}, testDate={{}}, sampleCode={{}}", flag, reportId, testDate, sampleCode);
 
         if ("1".equals(flag) && (testDate == null || sampleCode == null)) {
@@ -175,10 +172,7 @@ public class LisReportAction extends BaseAction {
      * 图像报告
      */
     @Action("image")
-    public Result getImage(String reportId, String sampleCode, String flag, String testDate, String openid) {
-        reportId = decodeReqString(reportId);
-        sampleCode = decodeReqString(sampleCode);
-
+    public Result getImage(@AesDecode String reportId, @AesDecode String sampleCode, String flag, String testDate, String openid) {
         log.info("查询Lis图像: flag={{}}, reportId={}, testDate={{}}, sampleCode={{}}", flag, reportId, testDate, sampleCode);
         if ("1".equals(flag) && (testDate == null || sampleCode == null)) {
             return Result.error(ResultEnum.PARAM_IS_BLANK);
@@ -253,10 +247,7 @@ public class LisReportAction extends BaseAction {
      * 细菌报告
      */
     @Action("bact")
-    public Result getBactResult(String reportId, String sampleCode, String flag, String testDate, String openid) {
-        reportId = decodeReqString(reportId);
-        sampleCode = decodeReqString(sampleCode);
-
+    public Result getBactResult(@AesDecode String reportId, @AesDecode String sampleCode, String flag, String testDate, String openid) {
         log.info("[Lis微生物结果]查询: flag={{}}, reportId={}, testDate={{}}, sampleCode={{}}", flag, reportId, testDate, sampleCode);
 
         if ("1".equals(flag) && (testDate == null || sampleCode == null)) {
@@ -301,9 +292,8 @@ public class LisReportAction extends BaseAction {
      * @return
      */
     @Action("downLisReport")
-    public Result downLisReport(String callNo, String queryType, String reportId) {
+    public Result downLisReport(String callNo, String queryType, @AesDecode String reportId) {
         // LIS类型 { 1:新八达LIS  2:瑞美LIS(需要加前缀M，红河不用加)  3:科华LIS }
-        reportId = decodeReqString(reportId);
         log.info("[LIS报告]下载: callNo={}, queryType={}, reportId={}", callNo, queryType, reportId);
         if ("2".equals(callNo)) { // 瑞美
             if (queryType == null) queryType = "1";
@@ -316,8 +306,7 @@ public class LisReportAction extends BaseAction {
      * 展示报告 瑞美专用
      */
     @Action("showLisReport")
-    public Result showLisReport(String queryCode) {
-        queryCode = decodeReqString(queryCode);  // ReportID 报告单ID
+    public Result showLisReport(@AesDecode String queryCode) {
         String queryType = "1";
         return RMLisDao.downLisReport(queryType, queryCode);
     }
diff --git a/src/main/java/com/ynxbd/common/action/report/PacsReportAction.java b/src/main/java/com/ynxbd/common/action/report/PacsReportAction.java
index 3d55217..01259b5 100644
--- a/src/main/java/com/ynxbd/common/action/report/PacsReportAction.java
+++ b/src/main/java/com/ynxbd/common/action/report/PacsReportAction.java
@@ -2,6 +2,7 @@ package com.ynxbd.common.action.report;
 
 import com.ynxbd.common.action.base.BaseAction;
 import com.ynxbd.common.bean.pacs.RISPacsReportInfo;
+import com.ynxbd.common.config.interceptor.AesDecode;
 import com.ynxbd.common.dao.pacs.RISPacsDao;
 import com.ynxbd.common.helper.common.ImageHelper;
 import com.ynxbd.common.helper.pacs.RISPacsHelper;
@@ -31,9 +32,7 @@ public class PacsReportAction extends BaseAction {
 
 
     @Action("/list")
-    public Result list(String outPatientNum, String inPatientNum, Integer pageNum) {
-        outPatientNum = decodeReqString(outPatientNum);
-        inPatientNum = decodeReqString(inPatientNum);
+    public Result list(@AesDecode String outPatientNum, @AesDecode String inPatientNum, Integer pageNum) {
         if (outPatientNum == null && inPatientNum == null) {
             return Result.error(ResultEnum.PARAM_IS_BLANK);
         }
diff --git a/src/main/java/com/ynxbd/common/action/report/ReportAction.java b/src/main/java/com/ynxbd/common/action/report/ReportAction.java
index 5b36f9d..6cf2207 100644
--- a/src/main/java/com/ynxbd/common/action/report/ReportAction.java
+++ b/src/main/java/com/ynxbd/common/action/report/ReportAction.java
@@ -6,6 +6,7 @@ import com.ynxbd.common.bean.lis.XBDLisReport;
 import com.ynxbd.common.bean.report.CheckReport;
 import com.ynxbd.common.bean.report.InspectionReport;
 import com.ynxbd.common.bean.report.PEIS;
+import com.ynxbd.common.config.interceptor.AesDecode;
 import com.ynxbd.common.dao.his.HisReportDao;
 import com.ynxbd.common.helper.common.DateHelper;
 import com.ynxbd.common.result.Result;
@@ -68,9 +69,8 @@ public class ReportAction extends BaseAction {
      * @return list
      */
     @Action("getCheckByPatient")
-    public Result getCheckByPatient(String begDate, String endDate, String patientId, String treatNum, String openid) {
+    public Result getCheckByPatient(String begDate, String endDate, @AesDecode String patientId, String treatNum, String openid) {
         try {
-            patientId = decodeReqString(patientId);
             // http://localhost:8080/wx/report/getCheckByPatient.do?patientId=153671&token=123
             log.info("[检查报告]查询 patientId={}, begDate={}, endDate={}, treatNum={}", patientId, begDate, endDate, treatNum);
             if (patientId == null || begDate == null || endDate == null) {
@@ -124,9 +124,8 @@ public class ReportAction extends BaseAction {
      * @return list
      */
     @Action("getHisCheckByTreat")
-    public Result getHisCheckByTreat(String begDate, String endDate, String patientId, String treatNum, Boolean isDistinctTreat, String openid) {
+    public Result getHisCheckByTreat(String begDate, String endDate, @AesDecode String patientId, String treatNum, Boolean isDistinctTreat, String openid) {
         try {
-            patientId = decodeReqString(patientId);
             // http://localhost:8080/wx/report/getCheckByPatient.do?patientId=153671&token=123
             log.info("[检查报告]查询 patientId={}, begDate={}, endDate={}, treatNum={}, isDistinctTreat={}", patientId, begDate, endDate, treatNum, isDistinctTreat);
             if (patientId == null || begDate == null || endDate == null) {
@@ -185,9 +184,8 @@ public class ReportAction extends BaseAction {
      * @param isLately    是否只查询最近一条记录
      */
     @Action("getTreatRecordList")
-    public Result getTreatRecordList(String begDate, String endDate, String patientId, String patientType, String reportType, Boolean isLately, String deptCode) {
+    public Result getTreatRecordList(String begDate, String endDate, @AesDecode String patientId, String patientType, String reportType, Boolean isLately, String deptCode) {
         try {
-            patientId = decodeReqString(patientId);
             // http://localhost:8081/wx/report/getTreatRecordList.do?patientId=406212&begDate=201801-01&endDate=2020-08-12&patientType=0&reportType=2
             if (patientId == null || begDate == null || endDate == null) {
                 return Result.error(ResultEnum.PARAM_IS_DEFECT);
@@ -224,9 +222,8 @@ public class ReportAction extends BaseAction {
      * @param isLately   是否只查询最近一条记录
      */
     @Action("getReportTreatRecords")
-    public Result getReportTreatRecords(String begDate, String endDate, String patientId, String treatType, String reportType, Boolean isLately, String deptCode) {
+    public Result getReportTreatRecords(String begDate, String endDate, @AesDecode String patientId, String treatType, String reportType, Boolean isLately, String deptCode) {
         try {
-            patientId = decodeReqString(patientId);
             // http://localhost:8081/wx/report/getTreatRecords.do?patientId=406212&begDate=201801-01&endDate=2020-08-12&treatType=0&reportType=2
             if (patientId == null || begDate == null || endDate == null) {
                 return Result.error(ResultEnum.PARAM_IS_DEFECT);
@@ -258,10 +255,8 @@ public class ReportAction extends BaseAction {
      * [患者]查询化验（检验）结果
      */
     @Action("getInspectByPatient")
-    public Result getInspectByPatient(String openid, String patientId, String begDate, String endDate) {
+    public Result getInspectByPatient(String openid, @AesDecode String patientId, String begDate, String endDate) {
         try {
-            patientId = decodeReqString(patientId);
-
             // http://localhost:8080/wx/report/getInspectByPatient.do?patientId=153671&token=123
             log.info("化验（检验）结果查询：patientId={}, begDate={}, endDate={}", patientId, begDate, endDate);
             if (patientId == null || begDate == null || endDate == null) {
@@ -286,10 +281,8 @@ public class ReportAction extends BaseAction {
      * [门诊号]通过HIS根据门诊号查询化验（检验）结果
      */
     @Action("getInspectByTreatNum")
-    public Result getInspectByTreatNum(String type, String treatNum, String patientId) {
+    public Result getInspectByTreatNum(@AesDecode String treatNum, @AesDecode String patientId, String type) {
         try {
-            treatNum = decodeReqString(treatNum);
-            patientId = decodeReqString(patientId);
             // http://localhost:8080/wx/report/getInspectByTreatNum.do?patientId=153671&token=123
             log.info("[化验（检验）]结果查询：patientId={}, type={}, treatNum={}", patientId, type, treatNum);
             if (patientId == null || type == null || treatNum == null) {
diff --git a/src/main/java/com/ynxbd/common/action/test/TestAction.java b/src/main/java/com/ynxbd/common/action/test/TestAction.java
index 8cba1e7..fc34d28 100644
--- a/src/main/java/com/ynxbd/common/action/test/TestAction.java
+++ b/src/main/java/com/ynxbd/common/action/test/TestAction.java
@@ -214,10 +214,9 @@ public class TestAction extends BaseAction {
         return Result.success();
     }
 
-//
+
 //    @Action("refundReg")
 //    public Result refundReg() {
-//
 //        List<Order> orders = new RegisterDao().selectRefundList("2022-09-22", "2022-09-29");
 //        log.info("退费笔数{}", orders.size());
 //        if (orders.size() > 60) {
@@ -229,8 +228,8 @@ public class TestAction extends BaseAction {
 //            if (openid != null && openid.length() == 16) {
 //                payCode = "ali";
 //            }
-//            new RegService().cancelRegReserve(payCode, item.getPatientId(), item.getTradeNo(), item.getHisTransNo());
+//            new RegService().cancelRegRes(payCode, item.getPatientId(), item.getTradeNo(), item.getHisTransNo());
 //       }
-//        return Result.success();
+//       return Result.success();
 //    }
 }
\ No newline at end of file