用setlId判断是否结算

src/main/java/thyyxxk/webserver/dao/his/inpatient/charge/ForceInAndOutDao.java

@@ -11,9 +11,9 @@ public interface ForceInAndOutDao {
     @Select("select count(1) from zy_actpatient where inpatient_no=#{patNo}")
     int getActpatientCount(String patNo);
 
-    @Select("select mdtrt_id from t_si_pat_info where pat_no=#{patNo} " +
-            "and times=#{times} and ledger_sn=#{ledgerSn}")
-    String getMdtrtId(SimplePatient patient);
+    @Select("select setl_id from t_si_setlinfo where pat_no=#{patNo} " +
+            "and times=#{times} and ledger_sn=#{ledgerSn} and revoked=0")
+    String getSetlId(SimplePatient patient);
 
     @Select("select rtrim(inpatient_no) as patNo,admiss_times as times,rtrim(name) as name," +
             "admiss_date as admDate,med_type,dis_date,rtrim(bed_status) as bedStatus," +

src/main/java/thyyxxk/webserver/service/inpatient/charge/ForceInAndOutService.java

@@ -155,8 +155,8 @@ public class ForceInAndOutService {
 
         MedType medType = MedType.get(patient.getMedType());
         if (medType != MedType.SELF_PAY) {
-            String mdtrtId = dao.getMdtrtId(patient);
-            if (StrUtil.isBlank(mdtrtId)) {
+            String setlId = dao.getSetlId(patient);
+            if (StrUtil.isBlank(setlId)) {
                 medType = MedType.SELF_PAY;
             }
         }