出院结算zy_actpatient表的总费用应该是所有账页的总费用

src/main/java/thyyxxk/webserver/dao/his/yibao/DismissDao.java

@@ -317,26 +317,6 @@ public interface DismissDao {
                          @Param("times") Integer times,
                          @Param("ledgerSn") int ledgerSn);
 
-
-    @Select("select sum(charge_fee) from zy_detail_charge where inpatient_no=#{patNo} and admiss_times=#{times} " +
-            "and ledger_sn=#{ledgerSn} and isnull(charge_status,'1')!='1' and isnull(infant_flag,'0')='1' " +
-            "and charge_date>=#{begntime} and charge_date<=#{endtime}")
-    String selectInfantFee(@Param("patNo") String patNo,
-                           @Param("times") int times,
-                           @Param("ledgerSn") int ledgerSn,
-                           @Param("begntime") Date begntime,
-                           @Param("endtime") Date endtime);
-
-    @Select("select isnull(sum(charge_fee),0) from zy_detail_charge where inpatient_no=#{patNo} and admiss_times=#{times} " +
-            "and ledger_sn=#{ledgerSn} and isnull(charge_status,'1')!='1' and isnull(infant_flag,'0')!='1' " +
-            "and charge_date>=#{begntime} and charge_date<=#{endtime}")
-    String selectAdultFee(@Param("patNo") String patNo,
-                          @Param("times") int times,
-                          @Param("ledgerSn") int ledgerSn,
-                          @Param("begntime") Date begntime,
-                          @Param("endtime") Date endtime);
-
-
     @Update("update zy_actpatient set total_charge=#{map.total},charge1=#{map.001},charge2=#{map.002}, " +
             "charge3=#{map.003},charge4=#{map.004},charge5=#{map.005},charge6=#{map.006},charge7=#{map.007}, " +
             "charge8=#{map.008},charge9=#{map.009},charge10=#{map.010},charge11=#{map.011},charge12=#{map.012}, " +
@@ -394,7 +374,7 @@ public interface DismissDao {
                                    @Param("restype") String restype,
                                    @Param("map") Map<String, String> map);
 
-    @Update("update zy_actpatient set balance=#{balance},responce_type=#{restype}, total_charge=#{map.total}, " +
+    @Update("update zy_actpatient set balance=#{balance},responce_type=#{restype}, total_charge=#{totalCost}, " +
             "charge1=#{map.001},charge2=#{map.002}, charge3=#{map.003},charge4=#{map.004},charge5=#{map.005}, " +
             "charge6=#{map.006},charge7=#{map.007}, charge8=#{map.008},charge9=#{map.009},charge10=#{map.010}, " +
             "charge11=#{map.011},charge12=#{map.012}, charge13=#{map.013},charge14=#{map.014},charge15=#{map.015}, " +
@@ -402,7 +382,13 @@ public interface DismissDao {
             "charge21=#{map.021},charge22=#{map.022}, charge23=#{map.023},charge24=#{map.024},charge25=#{map.025}, " +
             "charge26=#{map.026},charge27=#{map.027}, charge28=#{map.028},charge29=0,charge30=0 where inpatient_no=#{patNo} ")
     void updateZyActpatientCharges(@Param("patNo") String patNo,
+                                   @Param("totalCost") String totalCost,
                                    @Param("balance") String balance,
                                    @Param("restype") String restype,
                                    @Param("map") Map<String, String> map);
+
+    @Select("select isnull(sum(charge_fee),0) from zy_detail_charge where inpatient_no=#{patNo} " +
+            "and admiss_times=#{times} and ledger_sn>0 and isnull(charge_status,'1')!='1' ")
+    String selectTotalCharge(@Param("patNo") String patNo,
+                             @Param("times") int times);
 }

src/main/java/thyyxxk/webserver/service/yibao/DismissService.java

@@ -323,7 +323,8 @@ public class DismissService {
             dao.updateInfantfee(patNo1, patNo6, times, infantMap);
             entity.setInfant(infantMap);
         }
-        dao.updateZyActpatientCharges(patNo, balance, restype, ledgerMap);
+        String totalCost = dao.selectTotalCharge(patNo, times);
+        dao.updateZyActpatientCharges(patNo, totalCost, balance, restype, ledgerMap);
         entity.setAdult(adultMap);
         return entity;
     }