|
|
@@ -46,14 +46,14 @@ public interface MedicineManagementDao {
|
|
|
"and zy_drug.charge_code in (${chargeCodes}) ")
|
|
|
void submitMedicinePages(FetchMedicines params);
|
|
|
|
|
|
- @Select("select convert(varchar(5),a.charge_date,10) as chargeDate,b.name as chargeName,c.name as deptName,rtrim(d.name) as patName, " +
|
|
|
+ @Select("select convert(varchar(5),a.gen_time,10) as chargeDate,b.name as chargeName,c.name as deptName,rtrim(d.name) as patName, " +
|
|
|
"patGender=case when isnull(d.sex,'')='' then '' when d.sex='1'then '男'else '女'end, " +
|
|
|
"d.social_no,rtrim(a.inpatient_no) as patNo,rtrim(e.admiss_diag_str) as admdiag, " +
|
|
|
"b.specification2 as spec,a.charge_amount as chargeAmount,a.charge_fee as chargeFee,rtrim(a.charge_code_mx) as chargeCode " +
|
|
|
"from zy_detail_charge a left join a_patient_mi d on a.inpatient_no=d.inpatient_no " +
|
|
|
"left join zy_actpatient e on a.inpatient_no=e.inpatient_no,zd_unit_code c, " +
|
|
|
"(select name,specification2,code,drug_flag from yp_zd_dict where drug_flag>0 group by code,name,specification2,drug_flag) b " +
|
|
|
- "where a.charge_date>=#{start} and a.charge_date<=#{end} and a.exec_unit=#{dept} and " +
|
|
|
+ "where a.gen_time>=#{start} and a.gen_time<=#{end} and a.exec_unit=#{dept} and " +
|
|
|
"a.charge_code_mx=b.code and a.exec_unit=c.code " +
|
|
|
"union all " +
|
|
|
"select convert(varchar(5),a.charge_date,10) as chargeDate,b.name as chargeName,'麻醉科' as deptName,rtrim(d.name) as patName, " +
|
