缴费记录新增体检缴费查询，体检处方缴费移除Recipe参数

src/main/java/com/ynxbd/common/action/PatientAction.java

@@ -37,6 +37,7 @@ public class PatientAction extends BaseAction {
             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());

src/main/java/com/ynxbd/common/action/RecipeAction.java

@@ -33,13 +33,13 @@ public class RecipeAction extends BaseAction {
      * 获取已缴费项目
      */
     @Action("getPayedList")
-    public Result getPayedList(String patientId, String begDate, String endDate) {
+    public Result getPayedList(String patientId, String personNo, String begDate, String endDate) {
-        log.info("[处方]已缴费项目查询 patientId={}, begDate={}, endDate={}", patientId, begDate, endDate);
+        log.info("[处方]已缴费项目查询 patientId={}, begDate={}, endDate={}, personNo-{}", patientId, begDate, endDate,personNo);
         if (patientId == null || begDate == null || endDate == null) {
             return Result.error(ResultEnum.PARAM_IS_DEFECT);
         }
 
-        List<HisRecipe> recipeList = new HisRecipeDao().getPaidRecipeList(patientId, begDate, endDate);
+        List<HisRecipe> recipeList = new HisRecipeDao().getPaidRecipeList(patientId, begDate, endDate,personNo);
         return Result.success(recipeList);
     }
 

src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java

@@ -45,7 +45,7 @@ public class HisRecipeDao {
      * @param endDate   结束日期
      * @return 已缴费项目
      */
-    public List<HisRecipe> getPaidRecipeList(String patientId, String begDate, String endDate) {
+    public List<HisRecipe> getPaidRecipeList(String patientId, String begDate, String endDate,String personNo) {
         List<HisRecipe> resultList = new ArrayList<>();
 
         Map<String, Object> params = new HashMap<>();
@@ -53,6 +53,7 @@ public class HisRecipeDao {
         params.put("RecipeID", "");
         params.put("StartTime", begDate);
         params.put("EndTime", endDate);
+        params.put("PersonNo",personNo);
         JsonResult jsonResult = HisHelper.getJsonResult(HisEnum.AP_Query_OutpatientFee, params);
 
         if (!jsonResult.success()) { // 请求失败
@@ -194,6 +195,7 @@ public class HisRecipeDao {
             params.put("PatientID", "0");
             params.put("TJBH",treatNum.split("-")[1]);
             params.put("GroupFlag","1");
+            params.remove("Recipe");
         }
         return HisHelper.getJsonResult(HisEnum.AP_Pay_Invoice, params,merchantEnum);
     }