Merge branch 'feature/自定义模板抽取' into develop

performance/Performance.Services/ExtractExcelService/DictionaryService.cs

@@ -74,6 +74,7 @@ public void Handler(int hospitalId, per_allot allot, string groupName, bool isSi
                 if (hisScrips == null || !hisScrips.Any()) return;
                 foreach (var item in hisScrips)
                 {
+                    logService.ReturnTheLog(allot.ID, groupName, 2, "提取数据", $"提取{item.SourceType} - {item.Category}数据", isSingle: isSingle);
                     HisData(allot, configs.FirstOrDefault(t => t.Id == item.ConfigId), item);
                 }
             }

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -80,6 +80,9 @@ public string Main(int allotId, int hospitalId, string email, string groupName,
                 var dict = new Dictionary<ExDataDict, object>();
 
                 logService.ReturnTheLog(allotId, groupName, 3, "", 5, 1, isSingle);
+
+                queryService.ClearHistoryData(allot.ID, groupName, isSingle);
+
                 dictionaryService.Handler(hospitalId, allot, groupName, isSingle);
                 var data = queryService.Handler(hospitalId, allot, groupName, isSingle, ref dict);
                 var standData = StandDataFormat(hospitalId, data);

performance/Performance.Services/ExtractExcelService/QueryService.cs

@@ -77,8 +77,6 @@ public List<ex_result> Handler(int hospitalId, per_allot allot, string groupName
                 };
                 var extypeIds = GetQueryScriptIds(hospitalId, ref dict);
 
-                ClearHistoryData(allot.ID, groupName, isSingle);
-
                 var data = new List<ex_result>();
 
                 logService.ReturnTheLog(allot.ID, groupName, 2, "提取数据", $"开始提取数据", isSingle: isSingle);
@@ -157,7 +155,7 @@ private List<int> GetQueryScriptIds(int hospitalId, ref Dictionary<ExDataDict, o
         /// 清除历史抽取数据
         /// </summary>
         /// <param name="allotId"></param>
-        private void ClearHistoryData(int allotId, string groupName, bool isSingle)
+        public void ClearHistoryData(int allotId, string groupName, bool isSingle)
         {
             logService.ReturnTheLog(allotId, groupName, 2, "清除数据", $"开始清除历史提取数据", 1, isSingle);
             perallotRepository.ClearResultData(allotId);