咨询费用和复诊费用接口调整

1 year ago · 7ab1702cb7
parent d855d7cbbf
commit 7ab1702cb7
5 changed files with 89 additions and 71 deletions
--- a/src/main/java/com/ynxbd/common/action/TreatAction.java
+++ b/src/main/java/com/ynxbd/common/action/TreatAction.java
@ -53,14 +53,14 @@ public class TreatAction extends BaseAction {
     * @param openId      患者关注医院微信公众号的openId
     */
    @Action("createTreatRecord")
-    public Result createTreatRecord(String treatNum,String deptCode,String doctCode,String registCode, String regFee, String clinicFee, String transNo, String payMoney, String payDate, String payTime, String payWay, String payDeviceID, String bankTransNo, String openId) {
+    public Result createTreatRecord(String treatNum, String deptCode, String doctCode, String registCode, String regFee, String clinicFee, String transNo, String payMoney, String payDate, String payTime, String payWay, String payDeviceID, String bankTransNo, String openId) {
        log.info("[就诊记录]创建 treatNum={}", treatNum);
        try {
            if (treatNum == null) {
                return Result.error(ResultEnum.PARAM_IS_DEFECT);
            }

-            HisTreat treat = new HisTreatDao().createTreat(treatNum,deptCode,doctCode,registCode,regFee,clinicFee,transNo,payMoney,payDate,payTime,payWay,payDeviceID,bankTransNo,openId);
+            HisTreat treat = new HisTreatDao().createTreat(treatNum, deptCode, doctCode, registCode, regFee, clinicFee, transNo, payMoney, payDate, payTime, payWay, payDeviceID, bankTransNo, openId);
            return Result.success(treat);
        } catch (ServiceException e) {
            return Result.error(e);
@ -68,19 +68,31 @@ public class TreatAction extends BaseAction {
    }

    /**
-     * 查询复诊挂号费
+     * [问诊]查询咨询费用信息
+     *
+     * @param inquiryCode 收费项目代码
+     */
+    @Action("getInquiryFee")
+    public Result getInquiryFee(String inquiryCode) {
+        log.info("[问诊]查询咨询费用信息 inquiryCode={}", inquiryCode);
+        try {
+            return Result.success(new HisTreatDao().getInquiryFee(inquiryCode));
+        } catch (Exception e) {
+            return Result.error(e);
+        }
+    }
+
+    /**
+     * [问诊]查询复诊挂号费
+     *
     * @param clinicCode 号别
     */
    @Action("getReRegister")
-    public Result getReRegister(String clinicCode){
-        log.info("[查询复诊挂号费] clinicCode={}", clinicCode);
+    public Result getReRegister(String clinicCode) {
+        log.info("[问诊]查询复诊挂号费 clinicCode={}", clinicCode);
        try {
-            if (clinicCode == null) {
-                return Result.error(ResultEnum.PARAM_IS_DEFECT);
-            }
-            List<HisReRegister> hisReRegisterList = new HisTreatDao().getReRegister(clinicCode);
-            return Result.success(hisReRegisterList);
-        } catch (ServiceException e) {
+            return Result.success(new HisTreatDao().getReRegister(clinicCode));
+        } catch (Exception e) {
            return Result.error(e);
        }
    }
@ -121,11 +133,6 @@ public class TreatAction extends BaseAction {
        }
    }

-    @Action("getInquiryFee")
-    public Result getInquiryFee(String inquiryCode){
-        log.info("[互联网医院]查询问诊费用信息，inquiryCode-{}",inquiryCode);
-        return Result.success(new HisTreatDao().getInquiryFee(inquiryCode));
-    }

    @Action("createInquiry")
    public Result createInquiry(String patientId, String patientName, String payMoney, String payDate, String payTime, String transNo, String payDeviceId, String bankTransNo, String deptCode, String doctCode, String feeCode, String payWay, String ID, String begTime, String endTime, String IDCardNo, String remark, String doctTitleCode, String hospitalArea, String treatNum, String firstTreatNum, String openId) {
--- a/src/main/java/com/ynxbd/common/action/pay/MedicalAction.java
+++ b/src/main/java/com/ynxbd/common/action/pay/MedicalAction.java
@ -108,7 +108,7 @@ public class MedicalAction extends BaseAction {
        if (ObjectUtils.isEmpty(url)) {
            return Result.error(ResultEnum.PARAM_IS_INVALID);
        }
-        JSONObject respJson = WxMedicalHelper.getMdAuthUrl(url);
+        JSONObject respJson = WxMedicalHelper.getMdAuthRedirectUrl(url);
        return Result.success(respJson);
    }

--- a/src/main/java/com/ynxbd/common/bean/his/HisReRegister.java
+++ b/src/main/java/com/ynxbd/common/bean/his/HisReRegister.java
@ -5,6 +5,8 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;

+import java.math.BigDecimal;
+
 /**
 * @author 李进才
 * @ClassName HisReRegister
@ -19,8 +21,8 @@ import lombok.ToString;
 public class HisReRegister {
    private String clinicCode;
    private String clinicName;
-    private String attrib;
-    private double money;
-    private double regFee;
-    private double clinicFee;
+    private Integer attrib;
+    private BigDecimal money;
+    private BigDecimal regFee;
+    private BigDecimal clinicFee;
 }
--- a/src/main/java/com/ynxbd/common/dao/his/HisTreatDao.java
+++ b/src/main/java/com/ynxbd/common/dao/his/HisTreatDao.java
@ -42,11 +42,11 @@ public class HisTreatDao {
     *
     * @param treatNum 门诊号
     */
-    public HisTreat createTreat(String treatNum,String deptCode,String doctCode,String registCode, String regFee, String clinicFee, String transNo, String payMoney, String payDate, String payTime, String payWay, String payDeviceID, String bankTransNo, String openId) throws ServiceException {
+    public HisTreat createTreat(String treatNum, String deptCode, String doctCode, String registCode, String regFee, String clinicFee, String transNo, String payMoney, String payDate, String payTime, String payWay, String payDeviceID, String bankTransNo, String openId) throws ServiceException {
        JsonResult jsonResult = HisHelper.getJsonResult(HisEnum.XK_CREATE_TREAT, params -> {
            params.put("MZNum", treatNum);
-            params.put("DeptCode",deptCode);
-            params.put("DoctCode",doctCode);
+            params.put("DeptCode", deptCode);
+            params.put("DoctCode", doctCode);
            params.put("RegistCode", registCode);
            params.put("RegFee", regFee);
            params.put("ClinicFee", clinicFee);
@ -66,19 +66,40 @@ public class HisTreatDao {
        throw new ServiceException(jsonResult.getMessage());
    }

-    public List<HisReRegister> getReRegister (String clinicCode) throws ServiceException {
+
+    /**
+     * [问诊]查询咨询费用信息
+     *
+     * @param inquiryCode 收费项目代码
+     */
+    public List<InquiryFee> getInquiryFee(String inquiryCode) throws ServiceException {
+        JsonResult jsonResult = HisHelper.getJsonResult(HisEnum.XK_INQUIRY_FEE, params -> {
+            params.put("Code", inquiryCode);
+        });
+
+        if (jsonResult.success()) {
+            return jsonResult.getDataMapList(InquiryFee.class, "Items", "Item");
+        }
+        throw new ServiceException(jsonResult.getMessage());
+    }
+
+    /**
+     * [问诊]查询复诊挂号费
+     *
+     * @param clinicCode 号别
+     */
+    public List<HisReRegister> getReRegister(String clinicCode) throws ServiceException {
        JsonResult jsonResult = HisHelper.getJsonResult(HisEnum.XK_QUERY_RE_REGISTER, params -> {
            params.put("ClinicCode", clinicCode);
        });

        if (jsonResult.success()) {
-            return jsonResult.getDataMapList(HisReRegister.class,"RegisterFeeInfos","RegisterFeeInfo") ;
+            return jsonResult.getDataMapList(HisReRegister.class, "RegisterFeeInfos", "RegisterFeeInfo");
        }
        throw new ServiceException(jsonResult.getMessage());
    }


-
    public List<HisTreat> getInfoByTreatNum(String treatNum) throws ServiceException {
        List<HisTreat> dataList = new ArrayList<>();

@ -108,26 +129,10 @@ public class HisTreatDao {
        return data;
    }

-    /**
-     * 查询问诊费用信息
-     * @param inquiryCode 收费项目代码
-     * @return 问诊费用信息
-     */
-    public List<InquiryFee> getInquiryFee(String inquiryCode){
-        List<InquiryFee> dataList = new ArrayList<>();
-
-        JsonResult jsonResult = HisHelper.getJsonResult(HisEnum.XK_INQUIRY_FEE, params -> {
-            params.put("Code", inquiryCode);
-        });
-
-        if (jsonResult.success()) {
-            dataList = jsonResult.getDataMapList(InquiryFee.class, "Items", "Item");
-        }
-        return dataList;
-    }

    /**
     * 创建问诊订单
+     *
     * @param patientId     患者id
     * @param patientName   患者姓名
     * @param payMoney      支付金额
@ -152,8 +157,8 @@ public class HisTreatDao {
     * @param openId        微信OpenId
     * @return 是否成功
     */
-    public JsonResult createInquiry(String patientId, String patientName, String payMoney, String payDate, String payTime, String transNo, String payDeviceId, String bankTransNo, String deptCode, String doctCode, String feeCode, String payWay, String ID, String begTime, String endTime, String IDCardNo, String remark, String doctTitleCode, String hospitalArea, String  treatNum, String firstTreatNum, String openId){
-        return HisHelper.getJsonResult(HisEnum.XK_CREATE_INQUIRY,params->{
+    public JsonResult createInquiry(String patientId, String patientName, String payMoney, String payDate, String payTime, String transNo, String payDeviceId, String bankTransNo, String deptCode, String doctCode, String feeCode, String payWay, String ID, String begTime, String endTime, String IDCardNo, String remark, String doctTitleCode, String hospitalArea, String treatNum, String firstTreatNum, String openId) {
+        return HisHelper.getJsonResult(HisEnum.XK_CREATE_INQUIRY, params -> {
            params.put("PatientId", patientId);
            params.put("PatientName", patientName);
            params.put("PayMoney", payMoney);
--- a/src/main/java/com/ynxbd/wx/wxfactory/WxMedicalHelper.java
+++ b/src/main/java/com/ynxbd/wx/wxfactory/WxMedicalHelper.java
@ -186,7 +186,7 @@ public class WxMedicalHelper {
        }
        log.info("[医保]下单url payUrl={}", payUrl);
        map.put("payUrl", payUrl);
-        map.put("bankTransNo",order.getMedTransId());
+        map.put("bankTransNo", order.getMedTransId());
        return map;
    }

@ -211,10 +211,14 @@ public class WxMedicalHelper {

    /**
     * [医保]获取授权链接
+     *
+     * @param redirectUrl 回调地址
+     * @return json
     */
-    public static JSONObject getMdAuthUrl(String redirectUrl) {
+    public static JSONObject getMdAuthRedirectUrl(String redirectUrl) {
+        redirectUrl = (ObjectUtils.isEmpty(redirectUrl) ? "" : redirectUrl);
        JSONObject jsonObj = new JSONObject();
-        jsonObj.put("url", WxFactory.Medical.Common().getAuthUrl(ObjectUtils.isEmpty(redirectUrl) ? "" : redirectUrl));
+        jsonObj.put("url", WxFactory.Medical.Common().getAuthUrl(WeChatConfig.getWebUrl() + redirectUrl));
        jsonObj.put("type", MerchantEnum.WX_MEDICAL.CODE);
        return jsonObj;
    }
@ -314,7 +318,7 @@ public class WxMedicalHelper {
        }

        RespJsapiTicket response = WxFactory.Base.OAuth().getJsapiTicket();
-        if (response.getErrCode()!=0) {
+        if (response.getErrCode() != 0) {
            log.error("[微信]jsapi_ticket请求失败 code={}, message={}", response.getErrCode(), response.getErrMsg());
            return null;
        }