结算单上传中 and revoked = 0

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/UpIdCollectionDao.java

@@ -237,7 +237,7 @@ public interface UpIdCollectionDao {
             "from t_si_setlinfo " +
             "where pat_no = #{patNo} " +
             "  and times =  #{times} " +
-            "  and ledger_sn = #{ledgerSn}")
+            "  and ledger_sn = #{ledgerSn} and revoked = 0")
     String getMedicalCategory(@Param("patNo") String patNo,
                               @Param("times") Integer times,
                               @Param("ledgerSn") Integer ledgerSn);
@@ -521,7 +521,7 @@ public interface UpIdCollectionDao {
             "         left join " +
             "     a_patient_mi b on (a.patient_id = b.mz_no) " +
             "         left join t_si_pat_info c on (a.patient_id = c.pat_no and c.times = #{times}) " +
-            "         left join t_si_setlinfo d on (a.patient_id = d.pat_no and d.times = #{times}) " +
+            "         left join t_si_setlinfo d on (a.patient_id = d.pat_no and d.times = #{times} and revoked = 0 ) " +
             "where a.patient_id = #{patNo}")
     SetlinfoUpld mzPatInfo(@Param("patNo") String patNo,
                            @Param("times") Integer times);
@@ -529,10 +529,10 @@ public interface UpIdCollectionDao {
     @Select("select setl_id,mdtrt_id,insuplc_admdvs " +
             "from t_si_setlinfo " +
             "where pat_no =  #{patNo} " +
-            "  and times = #{times}")
+            "  and times = #{times} and revoked = 0 ")
     SetlinfoUpld mzJieSuanXinXi(@Param("patNo") String patNo, @Param("times") Integer times);
 
-    @Update("update t_si_setlinfo set ipt_med_type = #{iptMenType} where setl_id = #{setlId}")
+    @Update("update t_si_setlinfo set ipt_med_type = #{iptMenType} where setl_id = #{setlId} and revoked = 0")
     void modifyMedicalCategory(@Param("iptMenType") String iptMenType, @Param("setlId") String setlId);
 
     @Insert("insert into patient_bld_info (pat_no, times, bld_cat, bld_amt, bld_unit, bld_count) " + "values (#{patNo}, #{times}, #{bldCat}, cast(#{bldAmt} as decimal(6,1)), #{bldUnit}, (select isnull(max(bld_count), 0) from patient_bld_info where pat_no = ''))")
@@ -545,7 +545,7 @@ public interface UpIdCollectionDao {
     void removeBloodTransfusion(Integer id);
 
     @Select("select setl_list_id from t_si_setlinfo where " +
-            "pat_no = #{patNo} and times = #{times} and ledger_sn = #{ledgerSn}")
+            "pat_no = #{patNo} and times = #{times} and ledger_sn = #{ledgerSn} and revoked = 0")
     String billingListSerialNumber(@Param("patNo") String patNo,
                                    @Param("times") Integer times,
                                    @Param("ledgerSn") Integer ledgerSn);