Merge remote-tracking branch 'origin/develop' into develop

performance/Performance.Api/wwwroot/Performance.Api.xml

@@ -1378,6 +1378,14 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.PersonController.ReloadPersonnel(System.Int32,System.Int32)">
+            <summary>
+            重新加载人员字典
+            </summary>
+            <param name="hospitalId"></param>
+            <param name="allotId"></param>
+            <returns></returns>
+        </member>
         <member name="T:Performance.Api.Controllers.ReportController">
             <summary>
             报表

performance/Performance.Services/SheetSevice.cs

@@ -113,7 +113,8 @@ public SheetExportResponse SheetExport(int sheetID)
             }
             else
             {
-                CommonExport(sheetID, response);
+                CommonExport(sheetID, response,sheet.SheetType);
+                //response.Header = response.Header.Select(t => t.Data.ToDistinct(c => c.CellValue)).ToList();
                 if (new int[] { (int)SheetType.Income, (int)SheetType.OtherIncome, (int)SheetType.Expend, (int)SheetType.Workload }.Contains(sheet.SheetType.Value))
                 {
                     var point = 0;
@@ -141,12 +142,17 @@ public SheetExportResponse SheetExport(int sheetID)
             return response;
         }
 
-        private void CommonExport(int sheetID, SheetExportResponse response)
+        private void CommonExport(int sheetID, SheetExportResponse response,int? sheetType)
         {
-            var headList = _perforImHeaderRepository.GetEntities(t => t.SheetID == sheetID)?.OrderBy(t => t.PointCell).ToDistinct(t=>t.CellValue);
+            var headList = _perforImHeaderRepository.GetEntities(t => t.SheetID == sheetID)?.OrderBy(t => t.PointCell);
             if (headList == null) return;
-            var dataList = _perforImDataRepository.GetEntities(t => t.SheetID == sheetID)?.OrderByDescending(t => t.AccountingUnit).ToList();
 
+            if (sheetType == (int)SheetType.AccountBasic)
+                headList = headList.ToDistinct(t => t.CellValue).OrderBy(t => t.PointCell);
+            
+
+            var dataList = _perforImDataRepository.GetEntities(t => t.SheetID == sheetID)?.OrderByDescending(t => t.AccountingUnit).ToList();
+                   
             var sheet = _perforImSheetRepository.GetEntity(t => t.ID == sheetID);
 
             //添加系数值