二次绩效获取工作量条件修改、二次工作量抽取category、source赋值修改

performance/Performance.Repository/PerforPerAllotRepository.cs

@@ -188,7 +188,7 @@ public IEnumerable<report_original_workload> QueryWorkloadData(int allotid, stri
 WHERE t1.allotid = @allotid
 	AND t3.unittype in @unittypes
 	AND t3.accountingunit = @accountingunit
-	AND t1.Source LIKE CONCAT('%',@unittype,'工作量%')
+	AND (t1.Source LIKE CONCAT('%',@unittype,'工作量%') OR t1.Source = '通用工作量')
 	AND T1.IsDelete = 0
 GROUP BY ifnull(t1.DoctorName, '未知'),t1.PersonnelNumber,t1.Category
 ORDER BY t1.doctorname,t1.Category;";

performance/Performance.Services/ExtractExcelService/DictionaryService.cs

@@ -183,11 +183,11 @@ private void ExResult(per_allot allot, sys_hospitalconfig config, string sql, st
                 var result = data.Select(t => new ex_result
                 {
                     Department = t.Department,
-                    Category = t.Category?.Trim(),
+                    Category = enmae,
                     Fee = t.Value,
                     DoctorName = t.DoctorName,
                     PersonnelNumber = t.PersonnelNumber,
-                    Source = enmae,
+                    Source = "通用工作量",
                     DatabaseType = config.DataBaseType,
                     ConfigId = config.Id,
                     AllotId = allot.ID,