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 recipeList = new HisRecipeDao().getPaidRecipeList(patientId, begDate, endDate); + List 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 getPaidRecipeList(String patientId, String begDate, String endDate) { + public List getPaidRecipeList(String patientId, String begDate, String endDate,String personNo) { List resultList = new ArrayList<>(); Map 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); }