抽取添加注释

performance/Performance.Extract.Api/Controllers/ExtractController.cs

@@ -153,8 +153,8 @@ public void ExtractData([FromForm] IFormCollection form, int allotId, int hospit
             #endregion
 
             //string filePath = newExtractService.ExtractData(allotId, request.Email, hospitalId);
-            //string filePath = extractService.ExtractData(allotId, email, hospitalId, "User" + userId, path); //抽取
-            string filePath = extractService1.Main(allotId, hospitalId, email, "User" + userId, path);
+            string filePath = extractService.ExtractData(allotId, email, hospitalId, "User" + userId, path); //抽取
+            //string filePath = extractService1.Main(allotId, hospitalId, email, "User" + userId, path);
 
             #region 保存文件到网站下
 

performance/Performance.Services/EmployeeService.cs

@@ -446,7 +446,7 @@ public bool ConfirmAudit(int userid, AprAmountAuditRequest request)
             if (request.Id.Length == 0)
                 throw new PerformanceException("审核信息无效，请确认");
 
-            var apramounts = perapramountRepository.GetEntities(t => request.Id.Contains(t.Id));
+            var apramounts = perapramountRepository.GetEntities(t => (t.DoctorName ?? "") == request.DoctorName && (t.PersonnelNumber ?? "") == request.PersonnelNumber);
             foreach (var item in apramounts)
             {
                 item.Status = (request.IsPass == 1) ? 3 : 4;

performance/Performance.Services/ExtractExcelService/SheetDataWrite/ISheetDataWrite.cs

@@ -9,8 +9,25 @@ namespace Performance.Services.ExtractExcelService.SheetDataWrite
 {
     public interface ISheetDataWrite
     {
+        /// <summary>
+        /// 写入采集数据
+        /// </summary>
+        /// <param name="sheet">ISheet</param>
+        /// <param name="point">数据起始字典</param>
+        /// <param name="sheetType"></param>
+        /// <param name="style"></param>
+        /// <param name="collects">采集数据</param>
         void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType sheetType, ExcelStyle style, List<collect_data> collects);
 
+        /// <summary>
+        /// 写入抽取数据
+        /// </summary>
+        /// <param name="sheet">ISheet</param>
+        /// <param name="point">数据起始字典</param>
+        /// <param name="sheetType"></param>
+        /// <param name="style"></param>
+        /// <param name="data">抽取数据</param>
+        /// <param name="exdict">配置字典</param>
         void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType sheetType, ExcelStyle style, object data, Dictionary<ExDataDict, object> exdict = null);
     }
 }