diff --git a/src/main/java/com/ynxbd/wx/servlet/QServlet.java b/src/main/java/com/ynxbd/wx/servlet/QServlet.java index 66b2392..2f40db6 100644 --- a/src/main/java/com/ynxbd/wx/servlet/QServlet.java +++ b/src/main/java/com/ynxbd/wx/servlet/QServlet.java @@ -1,6 +1,5 @@ package com.ynxbd.wx.servlet; -import com.bocom.api.utils.Base64; import com.ynxbd.common.bean.enums.MerchantEnum; import com.ynxbd.common.helper.common.HttpHelper; import com.ynxbd.common.result.ResultEnum; @@ -50,12 +49,7 @@ public class QServlet extends HttpServlet { return; } } -// MerchantEnum merchantEnum = MerchantEnum.getMerchantEnumByQr(userAgent); -// if (merchantEnum == null) { -// log.info(ResultEnum.PAY_TYPE_NOT_SUPPORT.message); -// HttpHelper.outRespAlert(response, ResultEnum.PAY_TYPE_NOT_SUPPORT.message); -// return; -// } + String patientId = request.getParameter("p"); log.info("{} [patientId={}]多张处方扫码请求,开始解析...", merchantEnum.NAME, patientId); diff --git a/src/main/java/com/ynxbd/wx/servlet/YServlet.java b/src/main/java/com/ynxbd/wx/servlet/YServlet.java new file mode 100644 index 0000000..0ebf9be --- /dev/null +++ b/src/main/java/com/ynxbd/wx/servlet/YServlet.java @@ -0,0 +1,53 @@ +package com.ynxbd.wx.servlet; + +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 lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; +import org.slf4j.MDC; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @author 李进才 + * @ClassName YServlet + * @Description TODO + * @date 2024/05/08 16:40:00 + */ + +@Slf4j +@WebServlet("/y") +public class YServlet extends HttpServlet { + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException { + MDC.remove("ip"); + MDC.put("ip", HttpHelper.getIpAddress(request)); + + + + + // 移动查房 跳转 + String type = request.getParameter("type"); + if("ydcf".equals(type)){ + String treatNum = request.getParameter("treatNum"); + String patientType = request.getParameter("patientType"); + String begDate = request.getParameter("begDate"); + String endDate = request.getParameter("endDate"); + response.sendRedirect(WeChatConfig.getWebUrl() + "lis-report-ydcf.html?treatNum="+treatNum+"&patientType="+ patientType+"&begDate="+ begDate +"&endDate="+ endDate); + } + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + doPost(request, response); + } + +} diff --git a/src/main/resources/struts.xml b/src/main/resources/struts.xml index 722ebcb..d6a93be 100644 --- a/src/main/resources/struts.xml +++ b/src/main/resources/struts.xml @@ -17,6 +17,7 @@ /u_auth, /b_auth, /q, + /y, /qrpay, /ext/tj, /notify/wx_pay_notify_servlet,