lighter 3 лет назад
Родитель
Сommit
197286efc8

+ 4 - 4
src/main/java/thyyxxk/webserver/controller/medicalinsurance/SiInjuryController.java

@@ -14,7 +14,7 @@ import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.dictionary.PureCodeName;
 import thyyxxk.webserver.entity.medicalinsurance.injury.AdmissRegistration;
 import thyyxxk.webserver.entity.medicalinsurance.injury.InjurySiPatInfo;
-import thyyxxk.webserver.entity.yibao.dismiss.YbSettleFee;
+import thyyxxk.webserver.entity.yibao.dismiss.MedinsSettleFee;
 import thyyxxk.webserver.entity.yibao.patient.Patient;
 import thyyxxk.webserver.service.externalhttp.SiInjuryFeeUpld;
 import thyyxxk.webserver.service.externalhttp.SiInjurySystem;
@@ -131,14 +131,14 @@ public class SiInjuryController {
     @PostMapping("/calculateCost")
     public synchronized ResultVo<String> calculateCost(@RequestBody Patient p) {
         p.setStaffId(TokenUtil.getTokenUserId());
-        ResultVo<YbSettleFee> resultVo = injurySystem.calculateCost(p);
+        ResultVo<MedinsSettleFee> resultVo = injurySystem.calculateCost(p);
         if (null == resultVo) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "获取医保结算费用失败。");
         }
         if (resultVo.getCode() != ExceptionEnum.SUCCESS.getCode()) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, resultVo.getMessage());
         }
-        YbSettleFee settleFee = resultVo.getData();
+        MedinsSettleFee settleFee = resultVo.getData();
 
 //        根据结算单手动出院
 //        YbSettleFee settleFee = new YbSettleFee();
@@ -157,7 +157,7 @@ public class SiInjuryController {
         settleFee.setBedNo(p.getBedNo());
         settleFee.setWardCode(p.getAdmissWard());
         settleFee.setDeptCode(p.getAdmissDept());
-        return dismissService.doDismiss(settleFee);
+        return dismissService.executeDischarging(settleFee);
     }
 
     @PostMapping("/cancelCalculate")

+ 4 - 4
src/main/java/thyyxxk/webserver/controller/yibao/DismissController.java

@@ -54,9 +54,9 @@ public class DismissController {
     }
 
     @PostMapping("/selfPayDismiss")
-    public synchronized ResultVo<String> selfPayDismiss(@RequestBody YbSettleFee param) {
+    public synchronized ResultVo<String> selfPayDismiss(@RequestBody MedinsSettleFee param) {
         param.setStaffId(TokenUtil.getTokenUserId());
-        return service.doDismiss(param);
+        return service.executeDischarging(param);
     }
 
     @PassToken
@@ -98,7 +98,7 @@ public class DismissController {
         }
         p.setTable(table);
         if (p.getMedType().equals("01")) {
-            YbSettleFee feePojo = new YbSettleFee();
+            MedinsSettleFee feePojo = new MedinsSettleFee();
             feePojo.setInpatientNo(p.getInpatientNo());
             feePojo.setAdmissTimes(p.getAdmissTimes());
             feePojo.setBedNo(p.getBedNo());
@@ -108,7 +108,7 @@ public class DismissController {
             feePojo.setWardCode(p.getAdmissWard());
             feePojo.setDeptCode(p.getAdmissDept());
             feePojo.setTable(table);
-            return service.doDismiss(feePojo);
+            return service.executeDischarging(feePojo);
         } else {
             ZyPatientInfo zyPatientInfo = new ZyPatientInfo();
             zyPatientInfo.setInpatientNo(param.getInpatientNo());

+ 22 - 49
src/main/java/thyyxxk/webserver/dao/his/yibao/DismissDao.java

@@ -2,9 +2,7 @@ package thyyxxk.webserver.dao.his.yibao;
 
 import org.apache.ibatis.annotations.*;
 import thyyxxk.webserver.entity.dictionary.PureCodeName;
-import thyyxxk.webserver.entity.yibao.dismiss.ActOrderDetail;
-import thyyxxk.webserver.entity.yibao.dismiss.NegativeFee;
-import thyyxxk.webserver.entity.yibao.dismiss.ReceiptFee;
+import thyyxxk.webserver.entity.yibao.dismiss.*;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -153,14 +151,9 @@ public interface DismissDao {
                               @Param("times") Integer times, @Param("ledgerSn") int ledgerSn);
 
     @Insert("insert into zy_ledger_file_yb (inpatient_no,admiss_times,ledger_sn,total_cost,tczf,grzhzf,dbzf,xjzf," +
-            "full_self_pay,part_self_pay,hospital_pay) values (#{patNo},#{times},#{ledgerSn},#{fee0},#{fee1},#{fee2}, " +
-            "#{fee3},#{fee4},#{fullSelfPay},#{partSelfPay},#{hospitalPay})")
-    int writeYbSettleTable(@Param("patNo") String patNo,
-                           @Param("times") Integer times, @Param("ledgerSn") int ledgerSn,
-                           @Param("fee0") String fee0, @Param("fee1") String fee1, @Param("fee2") String fee2,
-                           @Param("fee3") String fee3, @Param("fee4") String fee4,
-                           @Param("fullSelfPay") String fullSelfPay, @Param("partSelfPay") String partSelfPay,
-                           @Param("hospitalPay") String hospitalPay);
+            "full_self_pay,part_self_pay,hospital_pay) values (#{inpatientNo},#{admissTimes},#{ledgerSn},#{totalCost}," +
+            "#{tczf},#{grzhzf},#{dbzf},#{xjzf},#{fullSelfPay},#{partSelfPay},#{hospitalPay})")
+    int insertZyLedgerFileYb(MedinsSettleFee settleFee);
 
     @Update("update zy_ledger_file set charge_yb=1 where inpatient_no=#{patNo} and " +
             "admiss_times=#{times} and ledger_sn=#{ledgerSn}")
@@ -187,42 +180,22 @@ public interface DismissDao {
     @Select("select max(infant_flag) FROM zy_detail_charge WHERE inpatient_no=#{patNo} and admiss_times=#{times}")
     int hasInfant(@Param("patNo") String patNo, @Param("times") Integer times);
 
-    @Update("update zy_ledger_file set account_date=#{dismissDate},settle_type='1',balance=0," +
-            "last_balance=total_charge,settle=deposit-total_charge,ward_code=#{wardCode}," +
-            "dept_code=#{deptCode},op_id_code=#{codeRs},responce_type='01',charge_yb=0 from zy_ledger_file " +
-            "where inpatient_no=#{patNo} and admiss_times=#{times} and ledger_sn=#{ledgerSn}")
-    int updateZifeiCostStatus(@Param("patNo") String patNo, @Param("times") Integer times,
-                              @Param("ledgerSn") int ledgerSn, @Param("wardCode") String wardCode,
-                              @Param("deptCode") String deptCode, @Param("codeRs") String codeRs,
-                              @Param("dismissDate") Date dismissDate);
-
-    @Select("select case when isnull(xjzf,0)!=0 then xjzf else (total_cost-tczf-grzhzf) end from zy_ledger_file_yb " +
-            "where inpatient_no=#{patNo} and admiss_times=#{times} and ledger_sn=#{ledgerSn}")
-    String selectMedinsCashPay(@Param("patNo") String patNo,
-                               @Param("times") Integer times,
-                               @Param("ledgerSn") int ledgerSn);
+    @Update("update zy_ledger_file set account_date=#{zjdzDatetime},settle_type='1',balance=0,dept_code=#{deptCode}," +
+            "last_balance=total_charge,settle=deposit-total_charge,ward_code=#{wardCode},op_id_code=#{staffId}," +
+            "responce_type='01',charge_yb=0,fund_pay_sumamt=0,acct_pay=0 from zy_ledger_file " +
+            "where inpatient_no=#{inpatientNo} and admiss_times=#{admissTimes} and ledger_sn=#{ledgerSn}")
+    int updateZifeiCostStatus(MedinsSettleFee settleFee);
 
-    @Update("update zy_ledger_file set account_date=#{dismissDate},settle_type='1',balance=0,last_balance=#{cash}, " +
-            "settle=(deposit-#{cash}),ward_code=#{wardCode},dept_code=#{deptCode},op_id_code=#{codeRs},charge_yb=0 " +
-            "where inpatient_no=#{patNo} and admiss_times=#{times} and ledger_sn=#{ledgerSn}")
-    int updateCostStatusWithoutInfant(@Param("patNo") String patNo, @Param("times") Integer times,
-                                      @Param("ledgerSn") int ledgerSn, @Param("wardCode") String wardCode,
-                                      @Param("deptCode") String deptCode, @Param("codeRs") String codeRs,
-                                      @Param("dismissDate") Date dismissDate, @Param("cash") String cash);
-
-    @Select("select tczf from zy_ledger_file_yb where inpatient_no=#{patNo} and admiss_times=#{times} and ledger_sn=#{ledgerSn}")
-    String selectMedinsFundPay(@Param("patNo") String patNo,
-                               @Param("times") Integer times,
-                               @Param("ledgerSn") int ledgerSn);
+    @Update("update zy_ledger_file set account_date=#{zjdzDatetime},settle_type='1',balance=0,last_balance=#{xjzf}, " +
+            "settle=(deposit-#{xjzf}),ward_code=#{wardCode},dept_code=#{deptCode},op_id_code=#{staffId},charge_yb=0 " +
+            "where inpatient_no=#{inpatientNo} and admiss_times=#{admissTimes} and ledger_sn=#{ledgerSn}")
+    int updateCostStatusWithoutInfant(MedinsSettleFee settleFee);
 
-    @Update("update zy_ledger_file set account_date=#{dismissDate},settle_type='1',balance=0, " +
-            "last_balance=(total_charge-#{fund}),settle=(deposit-total_charge+#{fund}), " +
-            "ward_code=#{wardCode},dept_code=#{deptCode},op_id_code=#{codeRs}, " +
-            "charge_yb=0 where inpatient_no=#{patNo} and admiss_times=#{times} and ledger_sn=#{ledgerSn}")
-    int updateCostStatusWithInfant(@Param("patNo") String patNo, @Param("times") Integer times,
-                                   @Param("ledgerSn") int ledgerSn, @Param("wardCode") String wardCode,
-                                   @Param("deptCode") String deptCode, @Param("codeRs") String codeRs,
-                                   @Param("dismissDate") Date dismissDate, @Param("fund") String fund);
+    @Update("update zy_ledger_file set account_date=#{zjdzDatetime},settle_type='1',balance=0, " +
+            "last_balance=(total_charge-#{tczf}),settle=(deposit-total_charge+#{tczf}), " +
+            "ward_code=#{wardCode},dept_code=#{deptCode},op_id_code=#{staffId}, " +
+            "charge_yb=0 where inpatient_no=#{inpatientNo} and admiss_times=#{admissTimes} and ledger_sn=#{ledgerSn}")
+    int updateCostStatusWithInfant(MedinsSettleFee settleFee);
 
     @Update("update zy_detail_charge set charge_status=3 where charge_status=2 and " +
             "inpatient_no=#{patNo} AND admiss_times=#{times} AND ledger_sn=#{ledgerSn}")
@@ -330,10 +303,10 @@ public interface DismissDao {
     @Update("update a_patient_mi set hic_no=#{hicNew} where inpatient_no=#{zyh}")
     void updateHic(@Param("zyh") String zyh, @Param("hicNew") String hicNew);
 
-    @Select("select med_type as code, mdtrt_id as name from t_si_pat_info where pat_no=#{patNo} and times=#{times} and ledger_sn=#{ledgerSn}")
-    PureCodeName selectMdtrtId(@Param("patNo") String patNo,
-                               @Param("times") Integer times,
-                               @Param("ledgerSn") int ledgerSn);
+    @Select("select mdtrt_id,med_type from t_si_pat_info where pat_no=#{patNo} and times=#{times} and ledger_sn=#{ledgerSn}")
+    BriefMdtrtInfo selectMdtrtId(@Param("patNo") String patNo,
+                                 @Param("times") Integer times,
+                                 @Param("ledgerSn") int ledgerSn);
 
     @Select("select serial_no from t_injury_si_pat_info where pat_no=#{patNo} and times=#{times} and ledger_sn=#{ledgerSn}")
     String selectInjurySerialNo(@Param("patNo") String patNo,

+ 9 - 0
src/main/java/thyyxxk/webserver/entity/yibao/dismiss/BriefMdtrtInfo.java

@@ -0,0 +1,9 @@
+package thyyxxk.webserver.entity.yibao.dismiss;
+
+import lombok.Data;
+
+@Data
+public class BriefMdtrtInfo {
+    private String mdtrtId;
+    private String medType;
+}

+ 2 - 1
src/main/java/thyyxxk/webserver/entity/yibao/dismiss/YbSettleFee.java → src/main/java/thyyxxk/webserver/entity/yibao/dismiss/MedinsSettleFee.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-public class YbSettleFee {
+public class MedinsSettleFee {
     private String table;
     private String inpatientNo;
     private Integer admissTimes;
@@ -51,4 +51,5 @@ public class YbSettleFee {
     public String getHospitalPay() {
         return (null == hospitalPay || hospitalPay.trim().equals("")) ? "0.00" : hospitalPay.trim();
     }
+
 }

+ 2 - 2
src/main/java/thyyxxk/webserver/service/externalhttp/SiInjurySystem.java

@@ -6,7 +6,7 @@ import com.dtflys.forest.annotation.JSONBody;
 import com.dtflys.forest.annotation.Post;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.medicalinsurance.injury.AdmissRegistration;
-import thyyxxk.webserver.entity.yibao.dismiss.YbSettleFee;
+import thyyxxk.webserver.entity.yibao.dismiss.MedinsSettleFee;
 import thyyxxk.webserver.entity.yibao.patient.Patient;
 
 import java.util.Map;
@@ -34,7 +34,7 @@ public interface SiInjurySystem {
     ResultVo<String> preCalculateCost(@JSONBody Patient p);
 
     @Post("/calculateCost")
-    ResultVo<YbSettleFee> calculateCost(@JSONBody Patient p);
+    ResultVo<MedinsSettleFee> calculateCost(@JSONBody Patient p);
 
     @Post("/cancelCalculate")
     ResultVo<String> cancelCalculate(@JSONBody Patient p);

+ 3 - 3
src/main/java/thyyxxk/webserver/service/medicalinsurance/SiZyService.java

@@ -16,7 +16,7 @@ import thyyxxk.webserver.entity.medicalinsurance.inpatient.*;
 import thyyxxk.webserver.entity.medicalinsurance.query.SiPatInfo;
 import thyyxxk.webserver.entity.medicalinsurance.setlinfo.SiSetldetail;
 import thyyxxk.webserver.entity.medicalinsurance.setlinfo.SiSetlinfo;
-import thyyxxk.webserver.entity.yibao.dismiss.YbSettleFee;
+import thyyxxk.webserver.entity.yibao.dismiss.MedinsSettleFee;
 import thyyxxk.webserver.entity.yibao.patient.Overview;
 import thyyxxk.webserver.service.externalhttp.SiZySrvc;
 import thyyxxk.webserver.service.yibao.DismissService;
@@ -463,7 +463,7 @@ public class SiZyService {
                 setldetailEntity.setLedgerSn(p.getLedgerSn());
                 setldetldao.insert(setldetailEntity);
             }
-            YbSettleFee settleFee = new YbSettleFee();
+            MedinsSettleFee settleFee = new MedinsSettleFee();
             if (p.getMidSetl()) {
                 settleFee.setZjdzDatetime(p.getZjdzDatetime());
             }
@@ -481,7 +481,7 @@ public class SiZyService {
             settleFee.setDbzf(setlinfo.getString("hifmi_pay"));
             settleFee.setXjzf(setlinfo.getString("psn_cash_pay"));
             settleFee.setTable(p.getTable());
-            return dismissService.doDismiss(settleFee);
+            return dismissService.executeDischarging(settleFee);
         }
         revokeDischarge(p);
         return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, result.getString(ERROR_MESSAGE));

+ 27 - 52
src/main/java/thyyxxk/webserver/service/yibao/DismissService.java

@@ -10,7 +10,6 @@ import thyyxxk.webserver.constants.Capacity;
 import thyyxxk.webserver.constants.sidicts.MedType;
 import thyyxxk.webserver.dao.his.yibao.DismissDao;
 import thyyxxk.webserver.entity.ResultVo;
-import thyyxxk.webserver.entity.dictionary.PureCodeName;
 import thyyxxk.webserver.entity.yibao.dismiss.*;
 import thyyxxk.webserver.entity.yibao.patient.Overview;
 import thyyxxk.webserver.entity.yibao.patient.Patient;
@@ -250,17 +249,17 @@ public class DismissService {
         }
 
         dao.deleteTemporaryTable(patNo, times);
-        PureCodeName medinfo = dao.selectMdtrtId(patNo, times, ledgerSn);
+        BriefMdtrtInfo medinfo = dao.selectMdtrtId(patNo, times, ledgerSn);
         if (null == medinfo) {
-            medinfo = new PureCodeName();
+            medinfo = new BriefMdtrtInfo();
         }
-        if (StringUtil.notBlank(medinfo.getName())) {
+        if (StringUtil.notBlank(medinfo.getMdtrtId())) {
             if (dao.hasDismissDiag(patNo, times) == 0) {
                 ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
                 exception.setMessage("此患者没有医保出院诊断。");
                 throw new BizException(exception);
             }
-            if (medinfo.getCode().equals(MedType.INJURY_HOSPITALIZATION.getCode())) {
+            if (medinfo.getMedType().equals(MedType.INJURY_HOSPITALIZATION.getCode())) {
                 ResultVo<String> feeCheck = injury.preCalculateCost(param);
                 if (feeCheck.getCode() != ExceptionEnum.SUCCESS.getCode()) {
                     ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
@@ -300,27 +299,21 @@ public class DismissService {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public ResultVo<String> doDismiss(YbSettleFee settleFee) throws BizException {
+    public ResultVo<String> executeDischarging(MedinsSettleFee settleFee) throws BizException {
         updateHicNo(settleFee.getInpatientNo());
         settleFee.setLedgerSn(dao.getLedgerSn(settleFee.getInpatientNo(), settleFee.getAdmissTimes()));
-        PureCodeName medinfo = dao.selectMdtrtId(settleFee.getInpatientNo(), settleFee.getAdmissTimes(), settleFee.getLedgerSn());
+        BriefMdtrtInfo medinfo = dao.selectMdtrtId(settleFee.getInpatientNo(), settleFee.getAdmissTimes(), settleFee.getLedgerSn());
         if (null == medinfo) {
-            medinfo = new PureCodeName();
+            medinfo = new BriefMdtrtInfo();
         }
         // 医保病人进行医保结算
-        if (StringUtil.notBlank(medinfo.getName())) {
-            int write;
+        if (StringUtil.notBlank(medinfo.getMdtrtId())) {
             dao.deleteZyLedgerFileYb(settleFee.getInpatientNo(), settleFee.getAdmissTimes(), settleFee.getLedgerSn());
-            String cashPay = settleFee.getXjzf();
-            String fundPay = settleFee.getTczf();
             // 如果医院支付为正,则 现金支付 = 现金支付 + 医院支付
             if (!settleFee.getHospitalPay().startsWith("-")) {
-                cashPay = DecimalUtil.add(cashPay, settleFee.getHospitalPay());
+                settleFee.setXjzf(DecimalUtil.add(settleFee.getXjzf(), settleFee.getHospitalPay()));
             }
-            write = dao.writeYbSettleTable(settleFee.getInpatientNo(), settleFee.getAdmissTimes(),
-                    settleFee.getLedgerSn(), settleFee.getTotalCost(), fundPay, settleFee.getGrzhzf(), settleFee.getDbzf(),
-                    cashPay, settleFee.getFullSelfPay(), settleFee.getPartSelfPay(), settleFee.getHospitalPay());
-            if (write < 1) {
+            if (dao.insertZyLedgerFileYb(settleFee) < 1) {
                 ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
                 exception.setMessage("写医保结算表失败。");
                 throw new BizException(exception);
@@ -333,13 +326,8 @@ public class DismissService {
             exception.setMessage("写发票表失败。");
             throw new BizException(exception);
         }
-        int code;
-        if (settleFee.getMidSetl()) {
-            code = hisMiddleSettle(settleFee);
-        } else {
-            code = setHisStatusOut(settleFee);
-        }
-        if (updateCostStatusToSettled(settleFee, StringUtil.notBlank(medinfo.getName())) < 1) {
+        int code = settleFee.getMidSetl() ? hisMiddleSettle(settleFee) : setHisStatusOut(settleFee);
+        if (updateCostStatusToSettled(settleFee, StringUtil.notBlank(medinfo.getMdtrtId())) < 1) {
             ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
             exception.setMessage("更新费用状态失败。");
             throw new BizException(exception);
@@ -352,7 +340,7 @@ public class DismissService {
         return ResultVoUtil.success();
     }
 
-    private int writeReceiptTable(YbSettleFee indata) {
+    private int writeReceiptTable(MedinsSettleFee indata) {
         if (dao.beforeWriteReceiptTable(indata.getInpatientNo(), indata.getAdmissTimes(),
                 indata.getLedgerSn()) < 1) {
             return -1;
@@ -454,37 +442,24 @@ public class DismissService {
         return disdate;
     }
 
-    private int updateCostStatusToSettled(YbSettleFee param, boolean medins) {
-        Date date = param.getMidSetl() ? param.getZjdzDatetime() : new Date();
-        final int code;
+    private int updateCostStatusToSettled(MedinsSettleFee settle, boolean medins) {
+        if (dao.updateZyDetailCharge(settle.getInpatientNo(), settle.getAdmissTimes(), settle.getLedgerSn()) < 1) {
+            return -1;
+        }
+        if (!settle.getMidSetl()) {
+            settle.setZjdzDatetime(new Date());
+        }
         if (medins) {
-            final int hasInfant = dao.hasInfant(param.getInpatientNo(), param.getAdmissTimes());
+            int hasInfant = dao.hasInfant(settle.getInpatientNo(), settle.getAdmissTimes());
             if (hasInfant == 0) {
-                String cash = dao.selectMedinsCashPay(param.getInpatientNo(), param.getAdmissTimes(), param.getLedgerSn());
-                if (StringUtil.isBlank(cash)) {
-                    cash = "0";
-                }
-                code = dao.updateCostStatusWithoutInfant(param.getInpatientNo(), param.getAdmissTimes(), param.getLedgerSn(),
-                        param.getWardCode(), param.getDeptCode(), param.getStaffId(), date, cash);
-            } else {
-                String fund = dao.selectMedinsFundPay(param.getInpatientNo(), param.getAdmissTimes(), param.getLedgerSn());
-                if (StringUtil.isBlank(fund)) {
-                    fund = "0";
-                }
-                code = dao.updateCostStatusWithInfant(param.getInpatientNo(), param.getAdmissTimes(), param.getLedgerSn(),
-                        param.getWardCode(), param.getDeptCode(), param.getStaffId(), date, fund);
+                return dao.updateCostStatusWithoutInfant(settle);
             }
-        } else {
-            code = dao.updateZifeiCostStatus(param.getInpatientNo(), param.getAdmissTimes(), param.getLedgerSn(),
-                    param.getWardCode(), param.getDeptCode(), param.getStaffId(), date);
-        }
-        if (code < 1) {
-            return -1;
+            return dao.updateCostStatusWithInfant(settle);
         }
-        return dao.updateZyDetailCharge(param.getInpatientNo(), param.getAdmissTimes(), param.getLedgerSn());
+        return dao.updateZifeiCostStatus(settle);
     }
 
-    private int setHisStatusOut(YbSettleFee settle) {
+    private int setHisStatusOut(MedinsSettleFee settle) {
         final Date disDate;
         if ("zy_actpatient".equals(settle.getTable())) {
             disDate = dao.selectActOrderDisDate(settle.getInpatientNo(), settle.getAdmissTimes());
@@ -517,14 +492,14 @@ public class DismissService {
         return insertNewZyWorkLog(settle);
     }
 
-    private int insertNewZyWorkLog(YbSettleFee param) {
+    private int insertNewZyWorkLog(MedinsSettleFee param) {
         final String userName = dao.getOperateName(param.getStaffId());
         String logType = param.getMidSetl() ? "zjdz" : "cyjs";
         return dao.insertNewZyWorkLog(param.getInpatientNo(), param.getAdmissTimes(), param.getLedgerSn(),
                 param.getWardCode(), logType, param.getDeptCode(), param.getStaffId(), userName);
     }
 
-    private int hisMiddleSettle(YbSettleFee param) {
+    private int hisMiddleSettle(MedinsSettleFee param) {
         param.setLedgerSn(dao.getLedgerSn(param.getInpatientNo(), param.getAdmissTimes()));
         int newLedgerSn = param.getLedgerSn() + 1;
         dao.updateTimesBilledByIncreaseOne(param.getInpatientNo(), param.getAdmissTimes(), param.getTable());