Forráskód Böngészése

优化出院预交金计算

lighter 10 hónapja
szülő
commit
adb49a33fd

+ 1 - 1
src/main/java/thyyxxk/webserver/dao/his/inpatient/DismissDao.java

@@ -387,7 +387,7 @@ public interface DismissDao {
 
     @Select("select cast(isnull(sum(depo_amount),0) as varchar(16)) from zy_deposit_file where " +
             "inpatient_no=#{patNo} and admiss_times=#{times} and ledger_sn=#{ledgerSn} and " +
-            "depo_type!='B' and status=1 ")
+            "depo_type!='B' and status in (1,2) ")
     String selectDepositSumamt(@Param("patNo") String patNo,
                                @Param("times") int times,
                                @Param("ledgerSn") int ledgerSn);

+ 1 - 1
src/main/java/thyyxxk/webserver/dao/his/inpatient/PatientDao.java

@@ -292,7 +292,7 @@ public interface PatientDao {
 
     @Update("update zy_ledger_file set deposit=(select isnull(sum(depo_amount),0) from zy_deposit_file f with(nolock) " +
             "where f.inpatient_no=#{zyh} and f.admiss_times=#{times} and f.ledger_sn=#{ledger} and f.status in ('1','2') ) " +
-            "where inpatient_no=#{zyh} and admiss_times=#{times} and ledger_sn=#{ledger}")
+            "where inpatient_no=#{zyh} and admiss_times=#{times} and ledger_sn=#{ledger} and account_date is null")
     void recountDeposit(@Param("zyh") String zyh,
                         @Param("times") int times,
                         @Param("ledger") int ledger);