bug修复

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

@@ -1604,6 +1604,11 @@
             科室
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.DeptResponse.ManagerNumber">
+            <summary>
+            科主任/护士长数量
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.DeptResponse.Number">
             <summary>
             核算单元医生数量

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

@@ -146,8 +146,10 @@ public AutoMapperConfigs()
             //CreateMap<PerDataAccountDoctor, res_accountdoctor>();
             //CreateMap<PerDataAccountNurse, res_accountnurse>();
             //CreateMap<res_accountdoctor, PerDataAccountBaisc>();
-            CreateMap<res_account, PerDataAccountBaisc>();
-            CreateMap<PerDataAccountBaisc, res_account>();
+            CreateMap<res_account, PerDataAccountBaisc>()
+                .ForMember(dest => dest.UnitType, opt => opt.MapFrom(src => ((UnitType)src.UnitType).ToString()));
+            CreateMap<PerDataAccountBaisc, res_account>()
+                .ForMember(dest => dest.UnitType, opt => opt.MapFrom(src => EnumHelper.GetItems<UnitType>().First(t => t.Name == src.UnitType).Value));
             //CreateMap<PerDataAccountBaisc, res_accountnurse>();
 
             //CreateMap<res_accountdoctor, ComputeSource>();

performance/Performance.DtoModels/PerExcel/PerDataAccountBaisc.cs

@@ -21,7 +21,7 @@ public class PerDataAccountBaisc : IPerData
         /// <summary>
         /// 核算单元类别 1 医生组 2护理组 3医技组
         /// </summary>
-        public Nullable<int> UnitType { get; set; }
+        public string UnitType { get; set; }
 
         /// <summary>
         /// 核算单元 

performance/Performance.DtoModels/Response/DeptResponse.cs

@@ -39,6 +39,11 @@ public class DeptResponse
         public string Department { get; set; }
 
         /// <summary>
+        /// 科主任/护士长数量
+        /// </summary>
+        public Nullable<int> ManagerNumber { get; set; }
+
+        /// <summary>
         /// 核算单元医生数量
         /// </summary>
         public Nullable<decimal> Number { get; set; }

performance/Performance.Services/AllotCompute/BaiscNormService.cs

@@ -121,7 +121,7 @@ public List<res_baiscnorm> DocterNurseBaiscnorm(List<res_baiscnorm> baiscnormLis
                 var sheet = list.FirstOrDefault(t => t.SheetType == info.SheetType);
                 var perData = sheet.PerData.Select(t => (PerDataAccountBaisc)t);
                 //剔除不同科室相同核算单元
-                var groupData = perData.Where(t => t.UnitType == (int)info.UnitType)
+                var groupData = perData.Where(t => t.UnitType == info.UnitType.ToString())
                     .GroupBy(t => t.AccountingUnit)
                     .Select(t => new { AccountingUnit = t.Key, Number = t.Sum(p => p.ManagerNumber + p.Number), PerforTotal = t.Max(p => p.PerforTotal) });
 

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -252,8 +252,8 @@ private List<PerSheet> MergeCompute(PerExcel excel, int allotid)
                 PerSheet sheet = new PerSheet(info.Name, info.Name, info.SheetType, new List<PerHeader>(), new List<IPerData>());
                 foreach (var unitType in info.UnitTypes)
                 {
-                    var atDataList = dataList.Where(t => t.UnitType == (int)unitType);
-                    foreach (var dept in dataList.Where(t => t.UnitType == (int)unitType))
+                    var atDataList = dataList.Where(t => t.UnitType == unitType.ToString());
+                    foreach (var dept in dataList.Where(t => t.UnitType == unitType.ToString()))
                     {
                         if (string.IsNullOrEmpty(dept.AccountingUnit))
                             continue;
@@ -325,7 +325,7 @@ public List<res_baiscnorm> ComputeMinimum(IEnumerable<PerDataAccountBaisc> accou
 
             foreach (var rule in basicRuleList)
             {
-                var dataList = accountList.Where(t => t.UnitType == (int)rule.UnitType);
+                var dataList = accountList.Where(t => t.UnitType == rule.UnitType.ToString());
                 var count = dataList.Sum(t => t.ManagerNumber + t.Number);
                 decimal totalValue = 0m;
                 foreach (var dept in dataList)

performance/Performance.Services/ExtractService.cs

@@ -333,7 +333,7 @@ private bool WriteExcel(string newpath, string originalPath, List<PerSheet> shee
                             var importRow = importSheet.CreateRow(maxHeaderRowNumber + i + 1);
                             Dictionary<string, Func<PerDataAccountBaisc, object>> keyValues = new Dictionary<string, Func<PerDataAccountBaisc, object>>
                             {
-                                { "核算单元类型", (t) => EnumHelper.GetDescription((UnitType)t.UnitType) },
+                                { "核算单元类型", (t) => t.UnitType },
                                 { "核算单元", (t) => t.AccountingUnit },
                                 { "科室名称", (t) => t.Department },
                                 { "医生组核算单元医生数量", (t) => t.Number },

performance/Performance.Services/PerExcelService/SheetDataCompute/PerSheetDataComputeWorkload.cs

@@ -102,7 +102,7 @@ public PerSheet OnceCompute(PerSheet sheet, List<CofDrugProp> confs = null)
         {
             //获取最大列坐标位置
             int thiscell = sheet.PerHeader.OrderByDescending(t => t.PointCell).FirstOrDefault().PointCell + 1;
-            PerHeader perHead = new PerHeader(0, thiscell, "工作量绩效合计", 0, 2, 1, new List<PerHeader>(), 1);
+            PerHeader perHead = new PerHeader(0, thiscell, "工作量绩效合计", 0, 1, 1, new List<PerHeader>(), 1);
 
             var dataList = sheet.PerData.Select(t => (PerData)t);
 

performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadDeptAccountingt.cs

@@ -32,7 +32,7 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
 
                 PerDataAccountBaisc unifyUnit = new PerDataAccountBaisc();
                 unifyUnit.RowNumber = r;
-                unifyUnit.UnitType = UnitType(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元类型").PointCell)?.ToString());
+                unifyUnit.UnitType = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元类型").PointCell)?.ToString();
                 unifyUnit.AccountingUnit = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元").PointCell)?.ToString();
                 unifyUnit.Department = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "科室名称").PointCell)?.ToString();
                 unifyUnit.ManagerNumber = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "科主任/护士长人数").PointCell)?.ToString());