From c3b7e8662fa19438a696320f92cbcb9e7d51e20a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=BF=9B=E6=89=8D?= Date: Fri, 20 Oct 2023 10:48:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=A0=E7=BD=91=E7=BB=9C=E6=94=BB=E9=98=B2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=84=E5=8A=A0=E5=AF=86=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=A4=84=E6=96=B9=E4=B8=8D=E8=83=BD=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E7=9A=84=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ynxbd/common/action/RecipeAction.java | 3 ++- src/main/java/com/ynxbd/common/action/RegisterAction.java | 1 + src/main/java/com/ynxbd/wx/servlet/QServlet.java | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ynxbd/common/action/RecipeAction.java b/src/main/java/com/ynxbd/common/action/RecipeAction.java index 04ae571..15223ac 100644 --- a/src/main/java/com/ynxbd/common/action/RecipeAction.java +++ b/src/main/java/com/ynxbd/common/action/RecipeAction.java @@ -38,6 +38,7 @@ public class RecipeAction extends BaseAction { if (patientId == null || begDate == null || endDate == null) { return Result.error(ResultEnum.PARAM_IS_DEFECT); } + patientId = getDecodeString(patientId); List recipeList = new HisRecipeDao().getPaidRecipeList(patientId, begDate, endDate,personNo); return Result.success(recipeList); @@ -52,7 +53,7 @@ public class RecipeAction extends BaseAction { if (patientId == null || begDate == null || endDate == null) { return Result.error(ResultEnum.PARAM_IS_DEFECT); } - + patientId = getDecodeString(patientId); int days = DateHelper.intervalDays(begDate, endDate, true); List hisRecipes = new HisRecipeDao().getUnPayRecipe(patientId, personNo, days); diff --git a/src/main/java/com/ynxbd/common/action/RegisterAction.java b/src/main/java/com/ynxbd/common/action/RegisterAction.java index 70c66ca..2d36793 100644 --- a/src/main/java/com/ynxbd/common/action/RegisterAction.java +++ b/src/main/java/com/ynxbd/common/action/RegisterAction.java @@ -186,6 +186,7 @@ public class RegisterAction extends BaseAction { return Result.error(ResultEnum.PARAM_IS_DEFECT); } + patientId = getDecodeString(patientId); List hisList = new HisRegisterDao().getRegSiteHistory(patientId, null); List resultList = new ArrayList<>(); diff --git a/src/main/java/com/ynxbd/wx/servlet/QServlet.java b/src/main/java/com/ynxbd/wx/servlet/QServlet.java index 40894b4..ce93165 100644 --- a/src/main/java/com/ynxbd/wx/servlet/QServlet.java +++ b/src/main/java/com/ynxbd/wx/servlet/QServlet.java @@ -4,6 +4,7 @@ import com.ynxbd.common.bean.enums.MerchantEnum; import com.ynxbd.common.helper.common.HttpHelper; import com.ynxbd.common.result.ResultEnum; import com.ynxbd.wx.config.WeChatConfig; +import com.ynxbd.wx.wxfactory.ReqParamHelper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.slf4j.MDC; @@ -53,7 +54,7 @@ public class QServlet extends HttpServlet { } if (MerchantEnum.WX.equals(merchantEnum)) { - response.sendRedirect(WeChatConfig.getWebUrl() + "pay-qr-recipe.html?p=" + patientId); + response.sendRedirect(WeChatConfig.getWebUrl() + "pay-qr-recipe.html?p=" + patientId + "&enp=" + ReqParamHelper.encode(patientId)); } }