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

src/main/java/com/ynxbd/common/action/TreatAction.java

@@ -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);
+        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) {

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);
     }
 

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;
 }

src/main/java/com/ynxbd/common/dao/his/HisTreatDao.java

@@ -66,6 +66,28 @@ public class HisTreatDao {
         throw new ServiceException(jsonResult.getMessage());
     }
 
+
+    /**
+     * [问诊]查询咨询费用信息
+     *
+     * @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);
@@ -78,7 +100,6 @@ public class HisTreatDao {
     }
 
 
-
     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      支付金额

src/main/java/com/ynxbd/wx/wxfactory/WxMedicalHelper.java

@@ -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;
     }