diff --git a/src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java b/src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java index b97d3438..38f1d1e3 100644 --- a/src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java +++ b/src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java @@ -1527,6 +1527,9 @@ public class ZbdcModel { Page p; Map _map = getSchoolAreaName(); String tSql = "select *,(xx_ldjy_qt_sum+cz_ldjy_qt_sum) as summary_ldjy_qt_sum,(xx_ck_js_sum+cz_ck_js_sum+gz_ck_js_sum) as summary_ck_js_sum,(xx_ck_mj_sum+cz_ck_mj_sum+gz_ck_mj_sum) as summary_ck_mj_sum,"; + //药品室 + tSql+="cz_hxypsshu+gz_hxypsshu as summary_hxypsshu,cz_hxypsmj+gz_hxypsmj as summary_hxypsmj,"; + tSql+="cz_swypsshu+gz_swypsshu as summary_swypsshu,cz_swypsmj+gz_swypsmj as summary_swypsmj,"; //护眼灯教室 护眼灯功能室 tSql += "xx_hjddjzsks+xx_hjddwjzsks as xx_hydjs,xx_hjddjzgnqshu+xx_hjddwjzgnqshu as xx_hydgns,"; tSql += "cz_hjddjzsks+cz_hjddwjzsks as cz_hydjs,cz_hjddjzgnqshu+cz_hjddwjzgnqshu as cz_hydgns,"; diff --git a/src/main/resource/ExcelExportTemplate/exportSummaryCgzb.xlsx b/src/main/resource/ExcelExportTemplate/exportSummaryCgzb.xlsx index d715d33b..1c927124 100644 Binary files a/src/main/resource/ExcelExportTemplate/exportSummaryCgzb.xlsx and b/src/main/resource/ExcelExportTemplate/exportSummaryCgzb.xlsx differ