Browse Source

费用清单添加收费时间

lighter 8 months ago
parent
commit
956e8c696e

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

@@ -61,7 +61,7 @@ public interface ChargeListDao {
             "(select name from yp_zd_unit e where e.code= " +
             "(select d.pack_unit from yp_zd_dict d where d.code=charge_code_mx and d.serial=a.serial)) end, " +
             "price=abs(round(charge_fee/case when charge_amount=0 then 1 else charge_amount end,2)), " +
-            "quantity=a.charge_amount,cost=charge_fee, " +
+            "quantity=a.charge_amount,cost=charge_fee,a.charge_date, " +
             "execDept=(select d.name from zd_unit_code d where d.code= " +
             "(case when isnull(exec_unit,'')='' then ward_code else exec_unit end)), " +
             "billItemCode=case when isnull(nullif(serial,''),'00')='00' then " +

+ 3 - 0
src/main/java/thyyxxk/webserver/entity/inpatient/chargelist/ChargeItem.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.Date;
 
 @Data
 public class ChargeItem {
@@ -27,6 +28,8 @@ public class ChargeItem {
     private String billItemCode;
     // 费用类别名称
     private String billItemName;
+    // 收费时间
+    private Date chargeDate;
 
     private String priceString;
     private String quantityString;