admin科室数据带出、数据录入4.1显示、二次绩效按照工号排序

performance/Performance.Api/Performance.Api.csproj

@@ -32,6 +32,7 @@
   
   <PropertyGroup>
     <PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>
+    <UserSecretsId>e732666b-5531-4cd8-b713-2fe3db31126c</UserSecretsId>
   </PropertyGroup>
   
   <ItemGroup>

performance/Performance.Api/Properties/PublishProfiles/FolderProfile.pubxml

@@ -16,7 +16,7 @@
     <ProjectGuid>3ae00ff5-f0ba-4d72-a23b-770186309327</ProjectGuid>
     <SelfContained>false</SelfContained>
     <_IsPortable>true</_IsPortable>
-    <publishUrl>E:\release\jx.suvalue.com</publishUrl>
+    <publishUrl>D:\release</publishUrl>
     <DeleteExistingFiles>True</DeleteExistingFiles>
   </PropertyGroup>
 </Project>
\ No newline at end of file

performance/Performance.Services/CollectService.cs

@@ -397,12 +397,21 @@ private List<HandsonRowData> GetCommonData(per_sheet sheet)
                     var units = rowdata.Where(w => w.UnitType.HasValue).Select(w => new { w.UnitType, w.AccountingUnit }).Distinct();
                     foreach (var item in units)
                     {
-                        if ((new[] { (int)UnitType.医生组, (int)UnitType.其他医生组 }).Contains(item.UnitType.Value))
+                        if ((new[] {(int) UnitType.医生组, (int) UnitType.其他医生组}).Contains(item.UnitType.Value))
+                        {
                             setdata.Add(new HandsonCellData("核算单元（医生组）", item.AccountingUnit));
-                        else if ((new[] { (int)UnitType.医技组, (int)UnitType.其他医技组 }).Contains(item.UnitType.Value))
+                            GetUnitClassification(setdata,UnitType.医生组,sheet);
+                        }
+                        else if ((new[] {(int) UnitType.医技组, (int) UnitType.其他医技组}).Contains(item.UnitType.Value))
+                        {
                             setdata.Add(new HandsonCellData("核算单元（医技组）", item.AccountingUnit));
-                        else if ((new[] { (int)UnitType.护理组, (int)UnitType.其他护理组 }).Contains(item.UnitType.Value))
+                            GetUnitClassification(setdata,UnitType.医技组,sheet);
+                        }
+                        else if ((new[] {(int) UnitType.护理组, (int) UnitType.其他护理组}).Contains(item.UnitType.Value))
+                        {
                             setdata.Add(new HandsonCellData("核算单元（护理组）", item.AccountingUnit));
+                            GetUnitClassification(setdata,UnitType.护理组,sheet);
+                        }
                         setdata.Add(new HandsonCellData("核算单元", item.AccountingUnit));
                     }
                     if (sheet.SheetType == (int)SheetType.PersonExtra)
@@ -506,6 +515,16 @@ private List<HandsonRowData> GetAccountBasic(per_sheet sheet)
             }
             return result;
         }
+
+        private void GetUnitClassification(List<HandsonCellData> setdata,UnitType unitType,per_sheet sheet)
+        {
+            if (sheet.SheetType == (int)SheetType.AccountExtra)
+                setdata.Add(new HandsonCellData("核算组别", unitType));
+            else if (sheet.SheetType == (int)SheetType.PersonExtra)
+                setdata.Add(new HandsonCellData("核算单元分类", unitType));
+            else if (sheet.SheetType == (int)SheetType.BudgetRatio)
+                setdata.Add(new HandsonCellData("核算单元类型", unitType));
+        }
         #endregion
 
         public void SaveCollectData(int allotId, SaveCollectData request)

performance/Performance.Services/Details/SecondAllotDetails.cs

@@ -107,7 +107,7 @@ public SecondResponse GetSecondDetails(int userId, int secondId, int hospitalId,
             SupplyHeaderByWorkItem(hospitalId, result, secondAllot, savedDataList);
 
             result.HeadItems = result.HeadItems.OrderBy(t => t.Type).ThenBy(t => t.WorkType).ThenBy(t => t.Sort).ThenBy(t => t.FiledName).ToList();
-            result.BodyItems = result.BodyItems.OrderBy(t => t.RowNumber).ThenBy(t => t.Value).ThenBy(t => t.Type).ThenBy(t => t.Sort).ToList();
+            result.BodyItems = result.BodyItems.OrderBy(t => t.RowNumber).ToList();
 
             return result;
         }
@@ -606,7 +606,7 @@ public List<ag_othersource> GetOtherTempDetails(int userId, int secondId, int is
                     var types = new string[] { "行政后勤", "行政工勤" };
                     var logistics = _imemployeelogisticsRepository.GetEntities(w => w.AllotID == secondAllot.AllotId && types.Contains(w.AccountType) && w.AccountingUnit == secondAllot.Department);
                     result = (logistics ?? new List<im_employee_logistics>())
-                        .OrderBy(t=>t.PersonnelNumber).Select(w => new ag_othersource
+                        .OrderBy(t=>Convert.ToInt32(t.PersonnelNumber)).Select(w => new ag_othersource
                     {
                         SecondId = secondId,
                         WorkNumber = w.PersonnelNumber,
@@ -622,12 +622,12 @@ public List<ag_othersource> GetOtherTempDetails(int userId, int secondId, int is
                 switch (employeeSource)
                 {
                     case (int)EmployeeSource.Initial:
-                        result = savedDataList.OrderBy(t => t.WorkNumber).ToList();
+                        result = savedDataList.OrderBy(t => Convert.ToInt32(t.WorkNumber)).ToList();
                         break;
 
                     case (int)EmployeeSource.EmployeeDict:
                         if (employees == null || !employees.Any()) return new List<ag_othersource>();
-                        result = employees.OrderBy(t=>t.PersonnelNumber).Select(t => new ag_othersource
+                        result = employees.OrderBy(t=>Convert.ToInt32(t.PersonnelNumber)).Select(t => new ag_othersource
                         {
                             SecondId = secondId,
                             WorkNumber = t.PersonnelNumber,
@@ -642,7 +642,7 @@ public List<ag_othersource> GetOtherTempDetails(int userId, int secondId, int is
                         isSupplementTitlePerformance = prevSavedDataList == null || !prevSavedDataList.Any();
                         if (prevSavedDataList != null && prevSavedDataList.Any())
                         {
-                            result = prevSavedDataList.OrderBy(t => t.WorkNumber)
+                            result = prevSavedDataList.OrderBy(t => Convert.ToInt32(t.WorkNumber))
                                 .Select(t => new ag_othersource
                                 {
                                     SecondId = secondId,