报表sql修改

performance/Performance.Repository/PerforReportRepository .cs

@@ -64,11 +64,11 @@ public List<PerReport> InpatFeeAvg(int hospitalId, List<string> date)
         /// <returns></returns>
         public List<PerReport> Medicine(int hospitalId, List<string> date)
         {
-            string sql = @"select accountingunit x,concat(year,'-',lpad(month,2,'0')) y,round((sum(if(dt.TypeName in 
-                (select charge from cof_drugtype where allotid = aot.id and chargetype = '药品'),cellvalue,0)) / sum(cellvalue))*100,2) value from per_allot aot 
-                join per_sheet sht on aot.id=sht.allotid join im_data dt on dt.sheetid=sht.id where unittype=1 and sheettype=3 
+            string sql = @"select accountingunit x,concat(year,'-',lpad(month,2,'0')) y,round((sum(if(cd.id is null,0,cellvalue))  / sum(cellvalue))*100,2) value 
+                from per_allot aot join per_sheet sht on aot.id=sht.allotid join im_data dt on dt.sheetid=sht.id 
+				left join cof_drugtype cd on cd.allotid=dt.allotid and cd.charge=dt.TypeName and cd.chargetype in ('药品') where unittype=1 and sheettype=3 
                 and sheetname like '%就诊收入' and ifnull(accountingunit,'') not in ('') and concat(year,'-',lpad(month,2,'0')) 
-                in @date group by year,month,accountingunit order by y asc,value desc;";
+                in @date and hospitalid = @hospitalId group by year,month,accountingunit order by y asc,value desc;";
             return DapperQuery(sql, new { hospitalId, date }).ToList();
         }
 
@@ -78,10 +78,10 @@ public List<PerReport> Medicine(int hospitalId, List<string> date)
         /// <returns></returns>
         public List<PerReport> Income(int hospitalId, List<string> date)
         {
-            string sql = @"select accountingunit x,concat(year,'-',lpad(month,2,'0')) y,round((sum(if(dt.TypeName not in 
-                (select charge from cof_drugtype where allotid = aot.id),cellvalue,0)) / sum(cellvalue))*100,2) value from per_allot aot 
-                join per_sheet sht on aot.id=sht.allotid join im_data dt on dt.sheetid=sht.id where unittype=1 and sheettype=3 
-                and sheetname like '%就诊收入' and ifnull(accountingunit,'') not in ('') and concat(year,'-',lpad(month,2,'0')) 
+            string sql = @"select accountingunit x,concat(year,'-',lpad(month,2,'0')) y,round((sum(if(cd.id is null,cellvalue,0)) / sum(cellvalue))*100,2) value
+                from per_allot aot join per_sheet sht on aot.id=sht.allotid join im_data dt on dt.sheetid=sht.id 
+				left join cof_drugtype cd on cd.allotid=dt.allotid and cd.charge=dt.TypeName and cd.chargetype in ('药品','耗材') 
+				where unittype=1 and sheettype=3 and sheetname like '%就诊收入' and ifnull(accountingunit,'') not in ('') and concat(year,'-',lpad(month,2,'0')) 
                 in @date and hospitalid = @hospitalId group by year,month,accountingunit order by y asc,value desc;";
             return DapperQuery(sql, new { hospitalId, date }).ToList();
         }