From b0d751b97c770776480fc4f51eb6cf99ba40e99a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=BF=9B=E6=89=8D?= <absorber@absorber.local>
Date: Thu, 19 Oct 2023 09:48:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E8=AE=B0=E5=BD=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=BD=93=E6=A3=80=E7=BC=B4=E8=B4=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=93=E6=A3=80=E5=A4=84=E6=96=B9=E7=BC=B4=E8=B4=B9?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4Recipe=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ynxbd/common/action/RecipeAction.java  | 6 +++---
 src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ynxbd/common/action/RecipeAction.java b/src/main/java/com/ynxbd/common/action/RecipeAction.java
index 2f4d6cc..04ae571 100644
--- a/src/main/java/com/ynxbd/common/action/RecipeAction.java
+++ b/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) {
-        log.info("[处方]已缴费项目查询 patientId={}, begDate={}, endDate={}", patientId, begDate, endDate);
+    public Result getPayedList(String patientId, String personNo, String begDate, String 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);
     }
 
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 e645132..f6e91b9 100644
--- a/src/main/java/com/ynxbd/common/dao/his/HisRecipeDao.java
+++ b/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);
     }