第一次重构

performance/Performance.Api/Controllers/AllotController.cs

@@ -25,24 +25,22 @@ public class AllotController : Controller
     {
         private AllotService _allotService;
         private HospitalService _hospitalService;
-        private PerExcelService _perExcelService;
+        private ConfigService _configService;
         private IHostingEnvironment _evn;
         private ILogger<AllotController> _logger;
         private ClaimService _claim;
 
         public AllotController(AllotService allotService,
-            HospitalService hospitalService,
-            PerExcelService perExcelService,
-            ILogger<AllotController> logger,
-            IHostingEnvironment evn,
+            HospitalService hospitalService, ConfigService configService,
+            ILogger<AllotController> logger, IHostingEnvironment evn,
             ClaimService claim)
         {
             _allotService = allotService;
             _hospitalService = hospitalService;
-            _perExcelService = perExcelService;
             _logger = logger;
             _evn = evn;
             _claim = claim;
+            _configService = configService;
         }
 
         /// <summary>
@@ -138,8 +136,8 @@ public ApiResponse Import([FromForm] IFormCollection form)
                 allot.UploadDate = DateTime.Now;
                 if (!_allotService.Update(allot))
                     return new ApiResponse(ResponseType.Fail, $"{file.FileName}上传成功，修改状态失败");
-                _perExcelService.Clear(allot.ID);
-                _perExcelService.Copy(allot);
+                _configService.Clear(allot.ID);
+                _configService.Copy(allot);
             }
 
             return new ApiResponse(ResponseType.OK);
@@ -158,7 +156,7 @@ public ApiResponse Generate([CustomizeValidator(RuleSet = "Delete"), FromBody]Al
             if (null == allot || string.IsNullOrEmpty(allot.Path))
                 throw new PerformanceException("当前绩效记录不存在或没有上传数据文件");
             //_perExcelService.Execute(allot);
-            BackgroundJob.Enqueue(() => _perExcelService.Execute(allot));
+            BackgroundJob.Enqueue(() => _allotService.Generate(allot));
             return new ApiResponse(ResponseType.OK);
         }
     }

performance/Performance.ConsoleApp/Program.cs

@@ -70,47 +70,6 @@ static void Main(string[] args)
                 options.UseMySQL(connection);
             });
 
-            //PerHeaderService perHeaderService = new PerHeaderService();
-            //PerSheetService perSheetService = new PerSheetService(perHeaderService);
-            //PerExcelService perExcelService = new PerExcelService(perSheetService, perHeaderService);
-            //var excel = perExcelService.Import(@"E:\code_git\performance\performance\Performance.Api\Files\9\201911\医院绩效分配系统数据收集模板V120190307133444707.xlsx");
-
-            PerExcelService perExcelService = services.BuildServiceProvider().GetService<PerExcelService>();
-
-            // 拷贝配置信息
-            //perExcelService.Copy(allot.ID);
-
-            string path = @"E:\code_git\performance\performance\Performance.Api\Files\9\201911\医院绩效分配系统数据收集模板V120190307133444707.xlsx";
-            // 导出数据
-            var excel = perExcelService.Import(path);
-
-            var workbook1 = perExcelService.ExportCompute(excel.PerSheet);
-
-            using (FileStream file = new FileStream($@"F:\myworkbook\org_{DateTime.Now.ToString("yyyyMMddhhmmss")}.xlsx", FileMode.Create))
-            {
-                workbook1.Write(file);
-            }
-
-            // 保存数据
-            perExcelService.Save(excel.PerSheet, 2, 1);
-
-            // 计算合并数据
-            List<PerSheet> list = perExcelService.ProcessCompute(excel);
-
-            // 保存过程数据
-            perExcelService.Save(list, 2, 2);
-
-            // 生成结果excel
-            var workbook2 = perExcelService.ExportCompute(list);
-
-            using (FileStream file = new FileStream($@"F:\myworkbook\comp_{DateTime.Now.ToString("yyyyMMddhhmmss")}.xlsx", FileMode.Create))
-            {
-                workbook2.Write(file);
-            }
-
-            // 计算最总数据
-            //perExcelService.Compute(excel);
-
             Console.ReadKey();
         }
     }

performance/Performance.DtoModels/PerExcel/ExcelEnum.cs

@@ -30,7 +30,7 @@ public enum SheetType
         [Description("特殊核算单元")]
         SpecialUnit = 8,
         [Description("临床科室医护绩效测算基础")]
-        DeptAccounting = 9,
+        AccountBasic = 9,
 
         [Description("科室经济核算汇总表")]
         ComputeEconomic = 10,

performance/Performance.Repository/PerforPerAllotRepository.cs

@@ -4,8 +4,8 @@
 // * history : Created by T4 2019-03-06 16:43:31 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using Performance.EntityModels;
+using System;
 
 namespace Performance.Repository
 {
@@ -14,8 +14,16 @@ namespace Performance.Repository
     /// </summary>
     public class PerforPerAllotRepository : PerforRepository<per_allot>
     {
-		public PerforPerAllotRepository(PerformanceDbContext context) : base(context)
+        public PerforPerAllotRepository(PerformanceDbContext context) : base(context)
+        {
+        }
+
+        public bool UpdateAllotStates(int allotId, int states, string remark)
         {
+            var allot = GetEntity(t => t.ID == allotId);
+            allot.States = states;
+            allot.Remark = remark;
+            return Update(allot);
         }
     }
 }

performance/Performance.Services/AllotCompute/BaiscNormService.cs

+using Performance.DtoModels;
+using Performance.EntityModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Performance.Services.AllotCompute
+{
+    /// <summary>
+    /// 绩效标准数据
+    /// </summary>
+    public class BaiscNormService : IAutoInjection
+    {
+        /// <summary>
+        /// 获取绩效标准基础值
+        /// </summary>
+        /// <param name="baiscnorms"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public decimal? GetBaiscNorm(List<res_baiscnorm> baiscnorms, PerformanceType type)
+        {
+            decimal? result = null;
+            if (type == PerformanceType.ReferenceDirector)
+            {
+                result = baiscnorms.FirstOrDefault(t => t.PositionName == "临床科主任")?.AvgValue;
+            }
+            else if (type == PerformanceType.ReferenceDirectorAvg)
+            {
+                List<string> avgObjectList = new List<string> { "临床科主任", "临床科副主任", "医技科主任", "临床科护长" };
+                var baisc = baiscnorms.Where(t => avgObjectList.Contains(t.PositionName));
+
+                result = baisc.Sum(s => s.TotelValue) / baisc.Sum(s => s.TotelNumber);
+            }
+            else if (type == PerformanceType.ReferenceHeadNurse)
+            {
+                result = baiscnorms.FirstOrDefault(t => t.PositionName == "临床科护长")?.AvgValue;
+            }
+            else if (type == PerformanceType.ReferenceNurseAvg95)
+            {
+                result = baiscnorms.FirstOrDefault(t => t.PositionName == "临床护士")?.AvgValue * 0.95m;
+            }
+            if (result.HasValue)
+                result = Math.Round(result.Value, 4);
+            return result;
+        }
+
+        /// <summary>
+        /// 获取临床护士平均绩效
+        /// </summary>
+        /// <param name="list"></param>
+        /// <returns></returns>
+        public res_baiscnorm NurseBaiscnorm(List<PerSheet> list)
+        {
+            var sheet = list.FirstOrDefault(t => t.SheetType == SheetType.ComputeNurseAccount);
+            var perdata = sheet.PerData.Select(t => (PerDataAccountNurse)t);
+            return new res_baiscnorm
+            {
+                PositionName = "临床护士",
+                TotelNumber = perdata.Sum(t => t.Number),
+                TotelValue = perdata.Sum(t => t.PerforTotal),
+                AvgValue = perdata.Sum(t => t.PerforTotal) / perdata.Sum(t => t.Number)
+            };
+        }
+
+        /// <summary>
+        /// 绩效标准计算
+        /// </summary>
+        /// <param name="computes"></param>
+        /// <returns></returns>
+        public List<res_baiscnorm> ComputeAvg(List<ComputeResult> computes)
+        {
+            var keyList = new[]
+            {
+                new { type = "临床科室", reference = "科室主任人均绩效", groupname = "临床科主任" },
+                new { type = "临床科室", reference = "科室副主任人均绩效", groupname = "临床科副主任" },
+                new { type = "医技科室", reference = "科室主任人均绩效", groupname = "医技科主任" },
+                new { type = "临床科室", reference = "科室护士长人均绩效", groupname = "临床科护长" },
+            };
+
+            var groupList = from cp in computes
+                            join gp in keyList on new { type = cp.AccountType, reference = cp.FitPeople } equals new { gp.type, gp.reference }
+                            select new { gp.groupname, cp };
+
+            var result = groupList.GroupBy(t => t.groupname)
+                .Select(s => new res_baiscnorm
+                {
+                    PositionName = s.Key,
+                    TotelNumber = s.Count(),
+                    TotelValue = s.Sum(t => t.cp.GiveFee),
+                    AvgValue = s.Sum(t => t.cp.GiveFee) / s.Count()
+                });
+            return result.ToList();
+        }
+    }
+}

performance/Performance.Services/AllotCompute/CheckDataService.cs

+using Performance.DtoModels;
+using Performance.EntityModels;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Performance.Services.AllotCompute
+{
+    public class CheckDataService : IAutoInjection
+    {
+        internal bool Check(PerExcel excel, per_allot allot)
+        {
+            return true; 
+        }
+    }
+}

performance/Performance.Services/AllotCompute/ImportDataService.cs

+using AutoMapper;
+using NPOI.HSSF.UserModel;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using Performance.DtoModels;
+using Performance.EntityModels;
+using Performance.Infrastructure;
+using Performance.Repository;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace Performance.Services.AllotCompute
+{
+    public class ImportDataService : IAutoInjection
+    {
+        private PerSheetService perSheetService;
+        private PerforPerSheetRepository perforPerSheetRepository;
+        private PerforImDataRepository perforImDataRepository;
+        private PerforImHeaderRepository perforImHeaderRepository;
+        private PerforImEmployeeRepository perforImEmployeeRepository;
+        private PerforImaccountbasicRepository perforImaccountbasicRepository;
+        private PerforImspecialunitRepository perforImspecialunitRepository;
+        public ImportDataService(PerSheetService perSheetService,
+            PerforPerSheetRepository perforPerSheetRepository,
+            PerforImDataRepository perforImDataRepository,
+            PerforImHeaderRepository perforImHeaderRepository,
+            PerforImEmployeeRepository perforImEmployeeRepository,
+            PerforImaccountbasicRepository perforImaccountbasicRepository,
+            PerforImspecialunitRepository perforImspecialunitRepository)
+        {
+            this.perSheetService = perSheetService;
+            this.perforPerSheetRepository = perforPerSheetRepository;
+            this.perforImDataRepository = perforImDataRepository;
+            this.perforImHeaderRepository = perforImHeaderRepository;
+            this.perforImEmployeeRepository = perforImEmployeeRepository;
+            this.perforImaccountbasicRepository = perforImaccountbasicRepository;
+            this.perforImspecialunitRepository = perforImspecialunitRepository;
+        }
+
+        /// <summary>
+        /// 读取excel并保存
+        /// </summary>
+        /// <param name="allot"></param>
+        /// <returns></returns>
+        public PerExcel ReadDataAndSave(per_allot allot)
+        {
+            var excel = Import(allot.Path);
+            Save(excel, allot.ID);
+            return excel;
+        }
+
+        /// <summary>
+        /// 导入excel数据
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        private PerExcel Import(string path)
+        {
+            PerExcel excel = new PerExcel
+            {
+                Path = path,
+                FileName = FileHelper.GetFileNameNoExtension(path),
+                Version = FileHelper.GetExtension(path) == ".xlsx" ? ExcelVersion.xlsx : ExcelVersion.xls,
+                PerSheet = new List<PerSheet>()
+            };
+            using (FileStream fs = new FileStream(path, FileMode.Open))
+            {
+                IWorkbook workbook = (excel.Version == ExcelVersion.xlsx)
+                    ? (IWorkbook)(new XSSFWorkbook(fs))
+                    : (IWorkbook)(new HSSFWorkbook(fs));
+                for (int i = 0; i < workbook.NumberOfSheets; i++)
+                {
+                    var sheet = workbook.GetSheetAt(i);
+                    if (SheetType.Unidentifiable != perSheetService.GetSheetType(sheet.SheetName))
+                    {
+                        var st = perSheetService.Sheet(sheet);
+                        excel.PerSheet.Add(st);
+                    }
+                }
+                return excel;
+            }
+        }
+
+        /// <summary>
+        /// 保存医院人员
+        /// </summary>
+        /// <param name="sheet"></param>
+        /// <param name="allotId"></param>
+        /// <returns></returns>
+        private void SaveEmployee(PerSheet sheet, int allotId)
+        {
+            var imsheet = new per_sheet { AllotID = allotId, SheetName = sheet.SheetName, Source = 1, SheetType = (int)sheet.SheetType };
+            perforPerSheetRepository.Add(imsheet);
+            var dataList = sheet.PerData.Select(t => (PerDataEmployee)t);
+            List<im_employee> addList = new List<im_employee>();
+            foreach (var data in dataList)
+            {
+                var imdata = Mapper.Map<im_employee>(data);
+                imdata.SheetID = imsheet.ID;
+                imdata.AllotID = allotId;
+                addList.Add(imdata);
+            }
+            perforImEmployeeRepository.AddRange(addList.ToArray());
+        }
+
+
+        /// <summary>
+        /// 保存科室绩效基础表
+        /// </summary>
+        /// <param name="sheet"></param>
+        /// <param name="allotId"></param>
+        /// <returns></returns>
+        private void SaveAccountBasic(PerSheet sheet, int allotId)
+        {
+            var imsheet = new per_sheet { AllotID = allotId, SheetName = sheet.SheetName, Source = 1, SheetType = (int)sheet.SheetType };
+            perforPerSheetRepository.Add(imsheet);
+
+            var dataList = sheet.PerData.Select(t => (PerDataAccountBaisc)t);
+            List<im_accountbasic> addList = new List<im_accountbasic>();
+            foreach (var data in dataList)
+            {
+                var imdata = Mapper.Map<im_accountbasic>(data);
+                imdata.SheetID = imsheet.ID;
+                imdata.AllotID = allotId;
+                addList.Add(imdata);
+            }
+            perforImaccountbasicRepository.AddRange(addList.ToArray());
+        }
+
+        /// <summary>
+        /// 保存特殊科室
+        /// </summary>
+        /// <param name="sheet"></param>
+        /// <param name="allotId"></param>
+        /// <returns></returns>
+        private void SaveSpecialUnit(PerSheet sheet, int allotId)
+        {
+            var imsheet = new per_sheet { AllotID = allotId, SheetName = sheet.SheetName, Source = 1, SheetType = (int)sheet.SheetType };
+            perforPerSheetRepository.Add(imsheet);
+
+            var dataList = sheet.PerData.Select(t => (PerDataSpecialUnit)t);
+            List<im_specialunit> addList = new List<im_specialunit>();
+            foreach (var data in dataList)
+            {
+                var imdata = Mapper.Map<im_specialunit>(data);
+                imdata.SheetID = imsheet.ID;
+                imdata.AllotID = allotId;
+                addList.Add(imdata);
+            }
+            perforImspecialunitRepository.AddRange(addList.ToArray());
+        }
+
+        /// <summary>
+        /// 保存通用格式
+        /// </summary>
+        /// <param name="sheet"></param>
+        /// <param name="allotId"></param>
+        /// <returns></returns>
+        private void SaveCommon(PerSheet sheet, int allotId)
+        {
+            var imsheet = new per_sheet { AllotID = allotId, SheetName = sheet.SheetName, Source = 1, SheetType = (int)sheet.SheetType };
+            perforPerSheetRepository.Add(imsheet);
+
+            List<im_header> addHeadList = new List<im_header>();
+            foreach (var header in sheet.PerHeader)
+            {
+                var imheader = Mapper.Map<im_header>(header);
+                imheader.SheetID = imsheet.ID;
+                imheader.AllotID = allotId;
+                perforImHeaderRepository.Add(imheader);
+                if (header.IsHasChildren)
+                {
+                    foreach (var child in header.Children)
+                    {
+                        var imheaderChild = Mapper.Map<im_header>(child);
+                        imheaderChild.SheetID = imsheet.ID;
+                        imheaderChild.ParentID = imheader.ID;
+                        imheaderChild.AllotID = allotId;
+                        addHeadList.Add(imheaderChild);
+                    }
+                }
+            }
+            perforImHeaderRepository.AddRange(addHeadList.ToArray());
+
+            List<im_data> addDataList = new List<im_data>();
+            var dataList = sheet.PerData.Select(t => (PerData)t);
+            foreach (var data in dataList)
+            {
+                var imdata = Mapper.Map<im_data>(data);
+                imdata.SheetID = imsheet.ID;
+                imdata.AllotID = allotId;
+                addDataList.Add(imdata);
+            }
+            perforImDataRepository.AddRange(addDataList.ToArray());
+        }
+
+        private bool Save(PerExcel excel, int allotId)
+        {
+            foreach (var sheet in excel.PerSheet)
+            {
+                if (sheet.SheetType == SheetType.Employee)
+                {
+                    SaveEmployee(sheet, allotId);
+                }
+                else if (sheet.SheetType == SheetType.AccountBasic)
+                {
+                    SaveAccountBasic(sheet, allotId);
+                }
+                else if (sheet.SheetType == SheetType.SpecialUnit)
+                {
+                    SaveSpecialUnit(sheet, allotId);
+                }
+                else
+                {
+                    SaveCommon(sheet, allotId);
+                }
+            }
+            return true;
+        }
+    }
+}

performance/Performance.Services/AllotCompute/ProcessComputService.cs

+using AutoMapper;
+using Performance.DtoModels;
+using Performance.EntityModels;
+using Performance.Repository;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Performance.Services.AllotCompute
+{
+    public class ProcessComputService : IAutoInjection
+    {
+        private PerforCofincomeRepository perforCofincomeRepository;
+        private PerforCofdrugpropRepository perforCofdrugpropRepository;
+        private PerforPerSheetRepository perforPerSheetRepository;
+        private PerforImDataRepository perforImDataRepository;
+        private PerforImHeaderRepository perforImHeaderRepository;
+        private PerforImEmployeeRepository perforImEmployeeRepository;
+        private PerforResAccountdoctorRepository perforResAccountdoctorRepository;
+        private PerforResAccountnurseRepository perforResAccountnurseRepository;
+        public ProcessComputService(PerforCofincomeRepository perforCofincomeRepository,
+            PerforCofdrugpropRepository perforCofdrugpropRepository,
+            PerforPerSheetRepository perforPerSheetRepository,
+            PerforImDataRepository perforImDataRepository,
+            PerforImHeaderRepository perforImHeaderRepository,
+            PerforImEmployeeRepository perforImEmployeeRepository,
+            PerforResAccountdoctorRepository perforResAccountdoctorRepository,
+            PerforResAccountnurseRepository perforResAccountnurseRepository)
+        {
+            this.perforCofincomeRepository = perforCofincomeRepository;
+            this.perforCofdrugpropRepository = perforCofdrugpropRepository;
+            this.perforPerSheetRepository = perforPerSheetRepository;
+            this.perforImDataRepository = perforImDataRepository;
+            this.perforImHeaderRepository = perforImHeaderRepository;
+            this.perforImEmployeeRepository = perforImEmployeeRepository;
+            this.perforResAccountdoctorRepository = perforResAccountdoctorRepository;
+            this.perforResAccountnurseRepository = perforResAccountnurseRepository;
+        }
+
+        public List<PerSheet> MergeAndSave(PerExcel excel, per_allot allot)
+        {
+            List<PerSheet> list = MergeCompute(excel);
+            Save(list, allot.ID);
+            return list;
+        }
+
+        /// <summary>
+        /// 保存计算后的医生组绩效
+        /// </summary>
+        /// <param name="sheet"></param>
+        /// <param name="allotId"></param>
+        /// <returns></returns>
+        private void SaveComputeDoctorAccount(PerSheet sheet, int allotId)
+        {
+            var imsheet = new per_sheet { AllotID = allotId, SheetName = sheet.SheetName, Source = 2, SheetType = (int)sheet.SheetType };
+            perforPerSheetRepository.Add(imsheet);
+
+            var dataList = sheet.PerData.Select(t => (PerDataAccountDoctor)t);
+            List<res_accountdoctor> addList = new List<res_accountdoctor>();
+            foreach (var data in dataList)
+            {
+                var imdata = Mapper.Map<res_accountdoctor>(data);
+                imdata.SheetID = imsheet.ID;
+                imdata.AllotID = allotId;
+                addList.Add(imdata);
+            }
+            perforResAccountdoctorRepository.AddRange(addList.ToArray());
+        }
+
+        /// <summary>
+        /// 保存计算后的护理组绩效
+        /// </summary>
+        /// <param name="sheet"></param>
+        /// <param name="allotId"></param>
+        /// <returns></returns>
+        private void SaveComputeNurseAccount(PerSheet sheet, int allotId)
+        {
+            var imsheet = new per_sheet { AllotID = allotId, SheetName = sheet.SheetName, Source = 2, SheetType = (int)sheet.SheetType };
+            perforPerSheetRepository.Add(imsheet);
+
+            var dataList = sheet.PerData.Select(t => (PerDataAccountNurse)t);
+            List<res_accountnurse> addList = new List<res_accountnurse>();
+            foreach (var data in dataList)
+            {
+                var imdata = Mapper.Map<res_accountnurse>(data);
+                imdata.SheetID = imsheet.ID;
+                imdata.AllotID = allotId;
+                addList.Add(imdata);
+            }
+            perforResAccountnurseRepository.AddRange(addList.ToArray());
+        }
+
+
+        /// <summary>
+        /// 保存通用格式
+        /// </summary>
+        /// <param name="sheet"></param>
+        /// <param name="allotId"></param>
+        /// <returns></returns>
+        private void SaveCommon(PerSheet sheet, int allotId)
+        {
+            var imsheet = new per_sheet { AllotID = allotId, SheetName = sheet.SheetName, Source = 2, SheetType = (int)sheet.SheetType };
+            perforPerSheetRepository.Add(imsheet);
+
+            List<im_header> addHeadList = new List<im_header>();
+            foreach (var header in sheet.PerHeader)
+            {
+                var imheader = Mapper.Map<im_header>(header);
+                imheader.SheetID = imsheet.ID;
+                imheader.AllotID = allotId;
+                perforImHeaderRepository.Add(imheader);
+                if (header.IsHasChildren)
+                {
+                    foreach (var child in header.Children)
+                    {
+                        var imheaderChild = Mapper.Map<im_header>(child);
+                        imheaderChild.SheetID = imsheet.ID;
+                        imheaderChild.ParentID = imheader.ID;
+                        imheaderChild.AllotID = allotId;
+                        addHeadList.Add(imheaderChild);
+                    }
+                }
+            }
+            perforImHeaderRepository.AddRange(addHeadList.ToArray());
+
+            List<im_data> addDataList = new List<im_data>();
+            var dataList = sheet.PerData.Select(t => (PerData)t);
+            foreach (var data in dataList)
+            {
+                var imdata = Mapper.Map<im_data>(data);
+                imdata.SheetID = imsheet.ID;
+                imdata.AllotID = allotId;
+                addDataList.Add(imdata);
+            }
+            perforImDataRepository.AddRange(addDataList.ToArray());
+        }
+
+        /// <summary>
+        /// 保存计算过程数据
+        /// </summary>
+        /// <param name="perSheets"></param>
+        /// <param name="allotId"></param>
+        private void Save(List<PerSheet> perSheets, int allotId)
+        {
+            foreach (var sheet in perSheets)
+            {
+                if (sheet.SheetType == SheetType.ComputeDoctorAccount)
+                {
+                    SaveComputeDoctorAccount(sheet, allotId);
+                }
+                else if (sheet.SheetType == SheetType.ComputeNurseAccount)
+                {
+                    SaveComputeNurseAccount(sheet, allotId);
+                }
+                else
+                {
+                    SaveCommon(sheet, allotId);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 合并计算
+        /// </summary>
+        private List<PerSheet> MergeCompute(PerExcel excel)
+        {
+            List<PerSheet> perSheet = new List<PerSheet>();
+
+            //合并科室收入、支出
+            var incomeconfs = perforCofincomeRepository.GetEntities();
+            var economicCompute = new PerSheetDataComputeEconomic();
+            var mergeResult = economicCompute.MergeCompute(excel, incomeconfs);
+            //一次计算
+            var onceEconomic = economicCompute.OnceCompute(mergeResult);
+
+            //二次计算 
+            var twiceEconomicResult = economicCompute.TwiceCompute(onceEconomic);
+
+            twiceEconomicResult.Sheet.SheetType = SheetType.ComputeEconomic;
+            perSheet.Add(twiceEconomicResult.Sheet);
+
+            //工作量
+            var workloadCompute = new PerSheetDataComputeWorkload();
+            var workload1 = excel.PerSheet.FirstOrDefault(t => t.SheetType == SheetType.Workload && t.SheetName.Contains("医生组"));
+            workload1.SheetName = "医生组工作量绩效测算表";
+
+            var confs = GetDrugConfig(excel);
+            //医生组 一次计算
+            var onceWorkload1 = workloadCompute.OnceCompute(workload1, confs);
+            //医生组 二次计算 
+            var twiceWorkloadResult1 = workloadCompute.TwiceCompute(onceWorkload1);
+
+            twiceWorkloadResult1.Sheet.SheetType = SheetType.ComputeDoctorWorkload;
+            perSheet.Add(twiceWorkloadResult1.Sheet);
+
+            var workload2 = excel.PerSheet.FirstOrDefault(t => t.SheetType == SheetType.Workload && t.SheetName.Contains("护理组"));
+            workload2.SheetName = "护理组工作量绩效测算表";
+            //护理组 一次计算
+            var onceWorkload2 = workloadCompute.OnceCompute(workload2);
+            //护理组 二次计算 
+            var twiceWorkloadResult2 = workloadCompute.TwiceCompute(onceWorkload2);
+
+            twiceWorkloadResult2.Sheet.SheetType = SheetType.ComputeNurseWorkload;
+            perSheet.Add(twiceWorkloadResult2.Sheet);
+
+            var deptAccounting = excel.PerSheet.FirstOrDefault(t => t.SheetType == SheetType.AccountBasic);
+            var dataList = deptAccounting.PerData.Select(t => (PerDataAccountBaisc)t);
+
+            PerSheet doctorSheet = new PerSheet("医生组临床科室单元核算表", "医生组临床科室单元核算表", SheetType.ComputeDoctorAccount, new List<PerHeader>(), new List<IPerData>());
+            PerSheet nurseSheet = new PerSheet("护理组临床科室单元核算表", "护理组临床科室单元核算表", SheetType.ComputeNurseAccount, new List<PerHeader>(), new List<IPerData>());
+            foreach (var dept in dataList)
+            {
+                var doctor = Mapper.Map<PerDataAccountDoctor>(dept);
+                var econDoctor = twiceEconomicResult.PerData.FirstOrDefault(t => t.UnitType == "医生组" && t.AccountingUnit == dept.AccountingUnit);
+                doctor.Income = econDoctor?.CellValue ?? 0;
+                var workDoctor = twiceWorkloadResult1.PerData.FirstOrDefault(t => t.UnitType == "医生组" && t.AccountingUnit == dept.AccountingUnit);
+                doctor.WorkloadFee = workDoctor?.CellValue ?? 0;
+                doctorSheet.PerData.Add(doctor);
+
+                var nurse = Mapper.Map<PerDataAccountNurse>(dept);
+                var econNurse = twiceEconomicResult.PerData.FirstOrDefault(t => t.UnitType == "护理组" && t.AccountingUnit == dept.AccountingUnit);
+                nurse.Income = econNurse?.CellValue ?? 0;
+                var workNurse = twiceWorkloadResult2.PerData.FirstOrDefault(t => t.UnitType == "护理组" && t.AccountingUnit == dept.AccountingUnit);
+                nurse.WorkloadFee = workNurse?.CellValue ?? 0;
+                nurseSheet.PerData.Add(nurse);
+            }
+            perSheet.Add(doctorSheet);
+            perSheet.Add(nurseSheet);
+
+            return perSheet;
+        }
+
+
+        /// <summary>
+        /// 获取药占比分割比例
+        /// </summary>
+        /// <param name="excel"></param>
+        /// <returns></returns>
+        private List<CofDrugProp> GetDrugConfig(PerExcel excel)
+        {
+            //计算药占比
+            List<CofDrugProp> cofs = new List<CofDrugProp>();
+
+            var incomeSheet = excel.PerSheet.FirstOrDefault(t => t.SheetType == SheetType.Income && t.SheetName.Contains("门诊") && t.SheetName.Contains("就诊"));
+            var datalist = incomeSheet.PerData.Select(t => (PerData)t);
+            var drugData = datalist.Where(t => t.TypeName == "西药费" || t.TypeName == "中成药费").GroupBy(t => t.AccountingUnit).Select(t => new { AccountingUnit = t.Key, SumValue = t.Sum(s => s.CellValue) });
+            var allData = datalist.GroupBy(t => t.AccountingUnit).Select(t => new { AccountingUnit = t.Key, SumValue = t.Sum(s => s.CellValue) });
+
+            var cofList = perforCofdrugpropRepository.GetEntities();
+
+            var unitList = drugData.Select(t => t.AccountingUnit).Union(allData.Select(t => t.AccountingUnit));
+            foreach (var unit in unitList)
+            {
+                var dsv = drugData.FirstOrDefault(t => t.AccountingUnit == unit)?.SumValue;
+                var asv = allData.FirstOrDefault(t => t.AccountingUnit == unit)?.SumValue;
+
+                var prop = asv.HasValue && asv.Value > 0 ? Math.Round((dsv ?? 0) / asv.Value, 2) : 0;
+                var fvalue = prop == 0
+                    ? 0
+                    : cofList.FirstOrDefault(t => prop > t.MinRange && prop <= t.MaxRange)?.Value ?? 0;
+                cofs.Add(new CofDrugProp { AccoutingUnit = unit, Factor = fvalue, Prop = prop });
+            }
+            return cofs;
+        }
+    }
+}

performance/Performance.Services/AllotCompute/ResultComputeService.cs

+using AutoMapper;
+using Performance.DtoModels;
+using Performance.EntityModels;
+using Performance.Infrastructure;
+using Performance.Repository;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Performance.Services.AllotCompute
+{
+    public class ResultComputeService : IAutoInjection
+    {
+        private ComputeDirector computeDirector;
+        private PerforImEmployeeRepository perforImEmployeeRepository;
+        private PerforCofworkyearRepository perforCofworkyearRepository;
+        private PerforCofdirectorRepository perforCofdirectorRepository;
+        private PerforResAccountdoctorRepository perforResAccountdoctorRepository;
+        private PerforResAccountnurseRepository perforResAccountnurseRepository;
+        private PerforRescomputeRepository perforRescomputeRepository;
+        private PerforResbaiscnormRepository perforResbaiscnormRepository;
+        private PerforResspecialunitRepository perforResspecialunitRepository;
+        public ResultComputeService(
+            PerforImEmployeeRepository perforImEmployeeRepository,
+            PerforCofworkyearRepository perforCofworkyearRepository,
+            PerforCofdirectorRepository perforCofdirectorRepository,
+            PerforResAccountdoctorRepository perforResAccountdoctorRepository,
+            PerforResAccountnurseRepository perforResAccountnurseRepository,
+            PerforRescomputeRepository perforRescomputeRepository,
+            PerforResbaiscnormRepository perforResbaiscnormRepository,
+            PerforResspecialunitRepository perforResspecialunitRepository,
+            ComputeDirector computeDirector)
+        {
+            this.computeDirector = computeDirector;
+            this.perforImEmployeeRepository = perforImEmployeeRepository;
+            this.perforCofworkyearRepository = perforCofworkyearRepository;
+            this.perforCofdirectorRepository = perforCofdirectorRepository;
+            this.perforResAccountdoctorRepository = perforResAccountdoctorRepository;
+            this.perforResAccountnurseRepository = perforResAccountnurseRepository;
+            this.perforRescomputeRepository = perforRescomputeRepository;
+            this.perforResbaiscnormRepository = perforResbaiscnormRepository;
+            this.perforResspecialunitRepository = perforResspecialunitRepository;
+        }
+
+        /// <summary>
+        /// 计算最终数据
+        /// </summary>
+        /// <param name="excel"></param>
+        public List<res_baiscnorm> Compute(per_allot allot, PerExcel excel, res_baiscnorm baiscnorm)
+        {
+            //取出人员信息           
+            var empolyeeList = perforImEmployeeRepository.GetEntities(t => t.AllotID == allot.ID);
+            //年资系数
+            var workyearList = perforCofworkyearRepository.GetEntities(t => t.AllotID == allot.ID);
+            //规模绩效和效率绩效配置表
+            var directorList = perforCofdirectorRepository.GetEntities(t => t.AllotID == allot.ID);
+            //取出医生科室
+            var doctorList = perforResAccountdoctorRepository.GetEntities(t => t.AllotID == allot.ID);
+            //取出护士科室
+            var nurseList = perforResAccountnurseRepository.GetEntities(t => t.AllotID == allot.ID);
+
+            List<ComputeEmployee> computeEmployees = Mapper.Map<List<ComputeEmployee>>(empolyeeList);
+
+            List<ComputeSource> computeSources = new List<ComputeSource>();
+            computeSources.AddRange(Mapper.Map<List<ComputeSource>>(doctorList));
+            computeSources.AddRange(Mapper.Map<List<ComputeSource>>(nurseList));
+
+            var computResult = computeDirector.Compute(computeEmployees, computeSources, directorList);
+            var baiscnormList = computeDirector.ComputeAvg(computResult);
+            baiscnormList.Add(baiscnorm);
+
+            var computResult2 = computeDirector.Compute(computeEmployees, baiscnormList, workyearList);
+
+
+            var computes = Mapper.Map<List<res_compute>>(computResult);
+            computes.AddRange(Mapper.Map<List<res_compute>>(computResult2));
+            computes.ForEach(t => t.AllotID = allot.ID);
+            perforRescomputeRepository.AddRange(computes.ToArray());
+
+            baiscnormList.ForEach(t => t.AllotID = allot.ID);
+            perforResbaiscnormRepository.AddRange(baiscnormList.ToArray());
+
+            return baiscnormList;
+        }
+
+
+        /// <summary>
+        /// 特殊科室绩效计算
+        /// </summary>
+        /// <param name="excel"></param>
+        /// <param name="allot"></param>
+        public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscnorm> baiscnormList)
+        {
+            var specialUnit = excel.PerSheet.FirstOrDefault(t => t.SheetType == SheetType.SpecialUnit);
+            if (specialUnit == null || specialUnit.PerData.Count == 0)
+                return;
+            var dataList = specialUnit.PerData.Select(t => (PerDataSpecialUnit)t);
+            BaiscNormService baiscNormService = new BaiscNormService();
+
+            var typeList = EnumHelper.GetItems<PerformanceType>();
+            List<res_specialunit> resDataList = new List<res_specialunit>();
+            foreach (var t in dataList)
+            {
+                var type = typeList.FirstOrDefault(o => o.Description == t.QuantitativeIndicators);
+                if (type != null)
+                    t.QuantitativeIndicatorsValue = baiscNormService.GetBaiscNorm(baiscnormList, (PerformanceType)type.Value);
+
+                var res = new res_specialunit
+                {
+                    AllotID = allot.ID,
+                    AccountingUnit = t.AccountingUnit,
+                    Department = t.AccountingUnit,
+                    Number = t.Number,
+                    QuantitativeIndicators = t.QuantitativeIndicators,
+                    Quantity = t.Quantity,
+                    QuantitativeIndicatorsValue = t.QuantitativeIndicatorsValue,
+                    ScoringAverage = t.ScoringAverage,
+                    OtherPerfor = t.OtherPerfor,
+                    Punishment = t.Punishment,
+                    Adjust = t.Adjust,
+                    Avg = t.Quantity * t.QuantitativeIndicatorsValue / t.Number,
+                    ShouldFee = t.Quantity * t.QuantitativeIndicatorsValue,
+                    GiveFee = (t.Quantity * t.QuantitativeIndicatorsValue + t.OtherPerfor + t.Punishment) * t.Adjust,
+                };
+                resDataList.Add(res);
+            }
+            perforResspecialunitRepository.AddRange(resDataList.ToArray());
+        }
+    }
+}

performance/Performance.Services/AllotService.cs

@@ -5,6 +5,7 @@
 using Performance.EntityModels;
 using Performance.Infrastructure;
 using Performance.Repository;
+using Performance.Services.AllotCompute;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -15,19 +16,35 @@ namespace Performance.Services
 {
     public class AllotService : IAutoInjection
     {
-        private PerforPerAllotRepository _allotRepository;
+        private BaiscNormService baiscNormService;
+        private CheckDataService checkDataService;
+        private ImportDataService importDataService;
+        private ProcessComputService processComputService;
+        private ResultComputeService resultComputeService;
+
         private IHostingEnvironment _evn;
         private ILogger<AllotService> _logger;
+        private PerforPerAllotRepository _allotRepository;
 
         public AllotService(PerforPerAllotRepository allotRepository,
-             IHostingEnvironment evn,
-             ILogger<AllotService> logger)
+             BaiscNormService baiscNormService,
+             CheckDataService checkDataService,
+             ImportDataService importDataService,
+             ProcessComputService processComputService,
+             ResultComputeService resultComputeService,
+             IHostingEnvironment evn, ILogger<AllotService> logger)
         {
             _allotRepository = allotRepository;
             _logger = logger;
             _evn = evn;
+            this.baiscNormService = baiscNormService;
+            this.checkDataService = checkDataService;
+            this.importDataService = importDataService;
+            this.processComputService = processComputService;
+            this.resultComputeService = resultComputeService;
         }
 
+        #region 基础功能
         /// <summary>
         /// 绩效记录
         /// </summary>
@@ -144,5 +161,36 @@ public bool Update(per_allot allot)
         {
             return _allotRepository.Update(allot);
         }
+        #endregion
+
+        public void Generate(per_allot allot)
+        {
+            _allotRepository.UpdateAllotStates(allot.ID, (int)AllotStates.InCheckData, EnumHelper.GetDescription(AllotStates.InCheckData));
+            // 导出数据
+            var excel = importDataService.ReadDataAndSave(allot);
+            if (checkDataService.Check(excel, allot))
+            {
+                _allotRepository.UpdateAllotStates(allot.ID, (int)AllotStates.CheckFail, EnumHelper.GetDescription(AllotStates.CheckFail));
+                return;
+            }
+            _allotRepository.UpdateAllotStates(allot.ID, (int)AllotStates.InGenerate, EnumHelper.GetDescription(AllotStates.InGenerate));
+            // 计算合并数据
+            List<PerSheet> list = processComputService.MergeAndSave(excel, allot);
+
+            var baiscnorm = baiscNormService.NurseBaiscnorm(list);
+
+            // 计算最总数据
+            var baiscnormList = resultComputeService.Compute(allot, excel, baiscnorm);
+            resultComputeService.SpecialUnitCompute(excel, allot, baiscnormList);
+
+            _allotRepository.UpdateAllotStates(allot.ID, (int)AllotStates.GenerateSucceed, EnumHelper.GetDescription(AllotStates.GenerateSucceed));
+            //发送邮件
+            SendEmail(allot);
+        }
+
+        private void SendEmail(per_allot allot)
+        {
+
+        }
     }
 }

performance/Performance.Services/ConfigService.cs

@@ -5,6 +5,7 @@
 using Performance.Repository;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
 namespace Performance.Services
@@ -15,15 +16,18 @@ public class ConfigService : IAutoInjection
         private PerforCofdrugpropRepository _drugpropRepository;
         private PerforCofincomeRepository _incomeRepository;
         private PerforCofworkyearRepository _workyearRepository;
+        private PerforPerAllotRepository perforPerAllotRepository;
         public ConfigService(PerforCofdirectorRepository cofdirectorRepository,
             PerforCofdrugpropRepository cofdrugpropRepository,
             PerforCofincomeRepository cofincomeRepository,
-            PerforCofworkyearRepository cofworkyearRepository)
+            PerforCofworkyearRepository cofworkyearRepository,
+            PerforPerAllotRepository perforPerAllotRepository)
         {
             this._directorRepository = cofdirectorRepository;
             this._drugpropRepository = cofdrugpropRepository;
             this._incomeRepository = cofincomeRepository;
             this._workyearRepository = cofworkyearRepository;
+            this.perforPerAllotRepository = perforPerAllotRepository;
         }
 
         #region cof_director
@@ -261,5 +265,68 @@ public bool WorkDelete(WorkyearRequest request)
             return _workyearRepository.Remove(workyear);
         }
         #endregion
+
+        /// <summary>
+        /// 清楚无效数据
+        /// </summary>
+        /// <param name="allotId"></param>
+        public void Clear(int allotId)
+        {
+            var director = _directorRepository.GetEntities(t => t.AllotID == allotId);
+            if (director != null)
+                _directorRepository.RemoveRange(director.ToArray());
+            var durgprop = _drugpropRepository.GetEntities(t => t.AllotID == allotId);
+            if (durgprop != null)
+                _drugpropRepository.RemoveRange(durgprop.ToArray());
+            var income = _incomeRepository.GetEntities(t => t.AllotID == allotId);
+            if (income != null)
+                _incomeRepository.RemoveRange(income.ToArray());
+            var workyear = _workyearRepository.GetEntities(t => t.AllotID == allotId);
+            if (workyear != null)
+                _workyearRepository.RemoveRange(workyear.ToArray());
+        }
+
+
+        /// <summary>
+        /// 复制报表基础配置
+        /// </summary>
+        /// <param name="iD"></param>
+        public void Copy(per_allot allot)
+        {
+            var list = perforPerAllotRepository.GetEntities(t => t.HospitalId == allot.HospitalId).OrderByDescending(t => t.Year).ThenBy(t => t.Month).ToList();
+            int allotId = 0;
+            for (int i = 0; i < list.Count; i++)
+            {
+                if (list[i].ID == allot.ID && (i - 1) >= 0)
+                    allotId = list[i - 1].ID;
+            }
+            if (allotId > 0)
+            {
+                var director = _directorRepository.GetEntities(t => t.AllotID == allotId);
+                if (director != null)
+                {
+                    var addData = director.Select(t => new cof_director { AllotID = allot.ID, JobTitle = t.JobTitle, TypeName = t.TypeName, Value = t.Value });
+                    _directorRepository.AddRange(addData.ToArray());
+                }
+                var durgprop = _drugpropRepository.GetEntities(t => t.AllotID == allotId);
+                if (durgprop != null)
+                {
+                    var addData = durgprop.Select(t => new cof_drugprop { AllotID = allot.ID, MaxRange = t.MaxRange, MinRange = t.MinRange, Value = t.Value });
+                    _drugpropRepository.AddRange(addData.ToArray());
+                }
+                var income = _incomeRepository.GetEntities(t => t.AllotID == allotId);
+                if (income != null)
+                {
+                    var addData = income.Select(t => new cof_income { AllotID = allot.ID, SheetNameKeyword = t.SheetNameKeyword, UnitName = t.UnitName, Value = t.Value });
+                    _incomeRepository.AddRange(addData.ToArray());
+                }
+                var workyear = _workyearRepository.GetEntities(t => t.AllotID == allotId);
+                if (workyear != null)
+                {
+                    var addData = workyear.Select(t => new cof_workyear { AllotID = allot.ID, MaxRange = t.MaxRange, MinRange = t.MinRange, Value = t.Value });
+                    _workyearRepository.AddRange(addData.ToArray());
+                }
+            }
+        }
     }
 }

performance/Performance.Services/PerExcelService/ComputeEmpolyee/BaiscNormService.cs

@@ -11,7 +11,7 @@ public class BaiscNormService : IAutoInjection
     {
         public decimal? GetBaiscNorm(List<res_baiscnorm> baiscnorms, PerformanceType type)
         {
-            decimal? result = null;
+            decimal? result = null; 
             if (type == PerformanceType.ReferenceDirector)
             {
                 result = baiscnorms.FirstOrDefault(t => t.PositionName == "临床科主任")?.AvgValue;

performance/Performance.Services/PerExcelService/ComputeEmpolyee/ComputeDirector.cs

 using Performance.DtoModels;
 using Performance.EntityModels;
 using Performance.Infrastructure;
+using Performance.Services.AllotCompute;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,6 +14,12 @@ namespace Performance.Services
     /// </summary>
     public class ComputeDirector : IAutoInjection
     {
+        private BaiscNormService baiscNormService;
+        public ComputeDirector(BaiscNormService baiscNormService)
+        {
+            this.baiscNormService = baiscNormService;
+        }
+
         /// <summary>
         /// 临床科室主任、临床科室副主任、临床科室护士长 计算
         /// </summary>
@@ -122,7 +129,6 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<res_
                 PerformanceType.ReferenceHeadNurse,
                 PerformanceType.Null,
             };
-            BaiscNormService baiscNormService = new BaiscNormService();
             List<ComputeResult> computeList = new List<ComputeResult>();
 
             foreach (var type in types)

performance/Performance.Services/PerExcelService/PerExcelService.cs

@@ -318,7 +318,7 @@ public void Save(List<PerSheet> perSheets, int allotId, int source)
                         _perforImEmployeeRepository.Add(imdata);
                     }
                 }
-                else if (sheet.SheetType == SheetType.DeptAccounting)
+                else if (sheet.SheetType == SheetType.AccountBasic)
                 {
                     var dataList = sheet.PerData.Select(t => (PerDataAccountBaisc)t);
                     List<im_accountbasic> addList = new List<im_accountbasic>();
@@ -409,77 +409,6 @@ public void Save(List<PerSheet> perSheets, int allotId, int source)
             //throw new NotImplementedException();
         }
 
-        public IWorkbook ExportCompute(List<PerSheet> sheetList)
-        {
-            IWorkbook workbook = new XSSFWorkbook();
-            var cellstyle = workbook.CreateCellStyle();
-            cellstyle.VerticalAlignment = VerticalAlignment.Center;
-            cellstyle.Alignment = HorizontalAlignment.Center;
-
-            foreach (var sheet in sheetList)
-            {
-                ISheet exportSheet = workbook.CreateSheet(sheet.SheetName);
-                //创建列头行
-                IRow row = null, childRow = null;
-                foreach (var header in sheet.PerHeader.OrderBy(t => t.PointCell))
-                {
-                    row = CreateRow(cellstyle, exportSheet, row, header);
-                    //创建二级列头
-                    if (header.IsHasChildren)
-                    {
-                        foreach (var child in header.Children.OrderBy(t => t.PointCell))
-                        {
-                            childRow = CreateRow(cellstyle, exportSheet, childRow, child);
-                        }
-                    }
-                }
-                //反转列头
-                var headList = _perHeaderService.GetPerHeaderReverse(sheet.PerHeader);
-                var dataList = sheet.PerData.Select(t => (PerData)t);
-                var maxrow = headList.Max(t => t.PointRow);
-                //循环核算单元 创建数据行
-                var accountingUnitList = dataList.OrderBy(t => t.RowNumber).Select(t => t.AccountingUnit).Distinct();
-                for (int i = 0; i < accountingUnitList.Count(); i++)
-                {
-                    var accountingUnit = accountingUnitList.ElementAt(i);
-                    IRow dataRow = exportSheet.CreateRow(i + maxrow + 2);
-                    dataRow.CreateCell(0).SetCellValue(accountingUnit);
-                    dataRow.GetCell(0).CellStyle = cellstyle;
-                    foreach (var header in headList.OrderBy(t => t.PointCell))
-                    {
-                        var cellValue = dataList.FirstOrDefault(t => t.AccountingUnit == accountingUnit && t.TypeName == header.CellValue)?.CellValue;
-                        if (cellValue.HasValue && cellValue.Value > 0)
-                        {
-                            dataRow.CreateCell(header.PointCell).SetCellValue(Convert.ToDouble(cellValue.Value));
-                            dataRow.GetCell(header.PointCell).CellStyle = cellstyle;
-                        }
-                    }
-                }
-            }
-            return workbook;
-        }
-
-        /// <summary>
-        /// 创建行
-        /// </summary>
-        /// <param name="cellstyle"></param>
-        /// <param name="exportSheet"></param>
-        /// <param name="row"></param>
-        /// <param name="header"></param>
-        /// <returns></returns>
-        private IRow CreateRow(ICellStyle cellstyle, ISheet exportSheet, IRow row, PerHeader header)
-        {
-            if (header.IsMerge)
-            {
-                var cellRange = new CellRangeAddress(header.PointRow, header.PointRow + header.MergeRow - 1, header.PointCell, header.PointCell + header.MergeCell - 1);
-                exportSheet.AddMergedRegion(cellRange);
-            }
-            row = row ?? exportSheet.CreateRow(header.PointRow);
-            row.CreateCell(header.PointCell).SetCellValue(header.CellValue);
-            row.GetCell(header.PointCell).CellStyle = cellstyle;
-            return row;
-        }
-
         /// <summary>
         /// 计算最终数据
         /// </summary>

performance/Performance.Services/PerExcelService/PerSheetDataFactory.cs

@@ -38,7 +38,7 @@ public static IPerSheetDataRead GetDataRead(SheetType sheetType)
                 case SheetType.Workload:
                     dataread = new PerSheetDataReadWorkload();
                     break;
-                case SheetType.DeptAccounting:
+                case SheetType.AccountBasic:
                     dataread = new PerSheetDataReadDeptAccountingt();
                     break;
                 case SheetType.SpecialUnit:

performance/Performance.Services/PerExcelService/PerSheetService.cs

@@ -66,7 +66,7 @@ public SheetType GetSheetType(string sheetName)
             else if (sheetName.StartsWith("3."))
                 return SheetType.Workload;
             else if (sheetName.StartsWith("4.1"))
-                return SheetType.DeptAccounting;
+                return SheetType.AccountBasic;
             else if (sheetName.StartsWith("4.2"))
                 return SheetType.SpecialUnit;
             return SheetType.Unidentifiable;
@@ -114,7 +114,7 @@ internal List<PerSheet> ProcessCompute(PerExcel excel)
             twiceWorkloadResult2.Sheet.SheetType = SheetType.ComputeNurseWorkload;
             perSheet.Add(twiceWorkloadResult2.Sheet);
 
-            var deptAccounting = excel.PerSheet.FirstOrDefault(t => t.SheetType == SheetType.DeptAccounting);
+            var deptAccounting = excel.PerSheet.FirstOrDefault(t => t.SheetType == SheetType.AccountBasic);
             var dataList = deptAccounting.PerData.Select(t => (PerDataAccountBaisc)t);
 
             PerSheet doctorSheet = new PerSheet("医生组临床科室单元核算表", "医生组临床科室单元核算表", SheetType.ComputeDoctorAccount, new List<PerHeader>(), new List<IPerData>());

performance/Performance.Services/Performance.Services.csproj

@@ -5,6 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Remove="PerExcelService\ComputeEmpolyee\BaiscNormService.cs" />
+    <Compile Remove="PerExcelService\PerExcelService.cs" />
     <Compile Remove="PerExcelService\SheetDataCompute\PerSheetDataComputeEconomicMerge.cs" />
   </ItemGroup>
 

performance/Performance.Services/SheetSevice.cs

@@ -76,7 +76,7 @@ public SheetExportResponse SheetExport(int sheetID)
             {
                 EmployeeExport(sheetID, response);
             }
-            else if (sheet.SheetType == (int)SheetType.DeptAccounting)
+            else if (sheet.SheetType == (int)SheetType.AccountBasic)
             {
                 AccountBaiscExport(sheetID, response);
             }