Merge tag '删除his_data、ex_result数据' into develop

# Conflicts:
#	performance/Performance.Services/ExtractExcelService/DictionaryService.cs

performance/Performance.Services/ExtractExcelService/DictionaryService.cs

@@ -232,7 +232,7 @@ private void HisData(per_allot allot, sys_hospitalconfig config, his_script scri
                 var data = queryService.QueryData<HisData>(config, script.ExecScript, allot, isSingle);
                 if (data == null || !data.Any()) return;
 
-                var hisdata = hisdataRepository.GetEntities(t => t.HospitalId == allot.HospitalId && t.Year == allot.Year && t.Month == allot.Month 
+                var hisdata = hisdataRepository.GetEntities(t => t.HospitalId == allot.HospitalId && t.Year == allot.Year && t.Month == allot.Month
                     && t.SourceType == script.SourceType && t.Category == script.Category);
                 if (hisdata != null && hisdata.Any())
                 {