web service 13002添加参数；添加13008

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

@@ -2,6 +2,7 @@ package com.ynxbd.common.action;
 
 
 import com.ynxbd.common.action.base.BaseAction;
+import com.ynxbd.common.bean.his.HisReRegister;
 import com.ynxbd.common.bean.his.HisTreat;
 import com.ynxbd.common.dao.his.HisTreatDao;
 import com.ynxbd.common.helper.common.AesHelper;
@@ -33,21 +34,57 @@ public class TreatAction extends BaseAction {
     }
 
 
+    /**
+     * 就诊记录创建
+     *
+     * @param treatNum       门诊号
+     * @param deptCode    医师科室代码
+     * @param doctCode    医师代码
+     * @param registCode  号别代码
+     * @param regFee      挂号费
+     * @param clinicFee   诊查费
+     * @param transNo     交易流水号
+     * @param payMoney    支付金额
+     * @param payDate     支付日期
+     * @param payTime     支付时间
+     * @param payWay      支付方式
+     * @param payDeviceID 支付终端编号
+     * @param bankTransNo 银行流水号(或"微信支付订单号"、"微信医保支付订单号")
+     * @param openId      患者关注医院微信公众号的openId
+     */
     @Action("createTreatRecord")
-    public Result createTreatRecord(String treatNum,String deptCode,String doctCode) {
+    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);
+            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);
         }
     }
 
+    /**
+     * 查询复诊挂号费
+     * @param clinicCode 号别
+     */
+    @Action("getReRegister")
+    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.error(e);
+        }
+    }
+
     @Action("getInfoByTreatNum")
     public Result getInfoByTreatNum(String treatNum) {
         try {

src/main/java/com/ynxbd/common/bean/his/HisReRegister.java

@@ -0,0 +1,26 @@
+package com.ynxbd.common.bean.his;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author 李进才
+ * @ClassName HisReRegister
+ * @Description TODO
+ * @date 2024/03/28 14:48:00
+ */
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class HisReRegister {
+    private String clinicCode;
+    private String clinicName;
+    private String attrib;
+    private double money;
+    private double regFee;
+    private double clinicFee;
+}

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

@@ -1,5 +1,6 @@
 package com.ynxbd.common.dao.his;
 
+import com.ynxbd.common.bean.his.HisReRegister;
 import com.ynxbd.common.bean.his.HisTreat;
 import com.ynxbd.common.bean.report.CheckReport;
 import com.ynxbd.common.bean.xk.InquiryFee;
@@ -41,11 +42,22 @@ public class HisTreatDao {
      *
      * @param treatNum 门诊号
      */
-    public HisTreat createTreat(String treatNum,String deptCode,String doctCode) 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("RegistCode", registCode);
+            params.put("RegFee", regFee);
+            params.put("ClinicFee", clinicFee);
+            params.put("TransNo", transNo);
+            params.put("PayMoney", payMoney);
+            params.put("PayDate", payDate);
+            params.put("PayTime", payTime);
+            params.put("PayWay", payWay);
+            params.put("PayDeviceID", payDeviceID);
+            params.put("BankTransNo", bankTransNo);
+            params.put("OpenId", openId);
         });
 
         if (jsonResult.success()) {
@@ -54,6 +66,18 @@ public class HisTreatDao {
         throw new ServiceException(jsonResult.getMessage());
     }
 
+    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") ;
+        }
+        throw new ServiceException(jsonResult.getMessage());
+    }
+
+
 
     public List<HisTreat> getInfoByTreatNum(String treatNum) throws ServiceException {
         List<HisTreat> dataList = new ArrayList<>();

src/main/java/com/ynxbd/common/helper/his/HisEnum.java

@@ -95,6 +95,8 @@ public enum HisEnum {
 
     XK_MEDICAL_RECIPE("[互联网医院]处方医保双通道流转","13007","UniversalInterface",true),
 
+    XK_QUERY_RE_REGISTER("[互联网医院]查询复诊挂号费","13008","UniversalInterface",true),
+
 
 
     ;