Merge branch '大屏稳定版0.1'

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

@@ -615,6 +615,18 @@
             <param name=""></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.ConfigController.GetSecondaryAlias">
+            <summary>
+            获取二次分配别名配置
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ConfigController.SaveSecondaryAlias(Performance.DtoModels.SaveCollectData)">
+            <summary>
+            保存二次分配别名配置
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetEmployeeList(Performance.DtoModels.EmployeeRequest)">
             <summary>
             获取人员列表
@@ -1199,6 +1211,36 @@
             <param name="form"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.ReportGlobalController.ReportPersonTag(System.Int32)">
+            <summary>
+            获取人员标签配置
+            </summary>
+            <param name="hospitalId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ReportGlobalController.SaveReportPersonTag(System.Int32,Performance.DtoModels.SaveCollectData)">
+            <summary>
+            保存科室标签配置
+            </summary>
+            <param name="hospitalId"></param>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ReportGlobalController.ReportTag(System.Int32)">
+            <summary>
+            获取人员标签配置
+            </summary>
+            <param name="hospitalId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ReportGlobalController.SaveReportTag(System.Int32,Performance.DtoModels.SaveCollectData)">
+            <summary>
+            保存科室标签配置
+            </summary>
+            <param name="hospitalId"></param>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="T:Performance.Api.Controllers.SecondAllotController">
             <summary>
             二次绩效

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

@@ -64,6 +64,9 @@
         <member name="P:Performance.EntityModels.PerformanceDbContext.cof_again">
             <summary>  </summary>
         </member>
+        <member name="P:Performance.EntityModels.PerformanceDbContext.cof_alias">
+            <summary>  </summary>
+        </member>
         <member name="P:Performance.EntityModels.PerformanceDbContext.cof_check">
             <summary> 上传excel文件校验配置 </summary>
         </member>

performance/Performance.Repository/PerforCofdirectorRepository.cs

@@ -29,7 +29,6 @@ public int DeleteData(int allotId)
                 "im_header",
                 "im_specialunit",
                 "log_check",
-                "per_employee",
                 "per_sheet",
                 "res_account",
                 "res_accountdoctor",

performance/Performance.Repository/PerforPerAllotRepository.cs

@@ -30,6 +30,21 @@ public bool UpdateAllotStates(int allotId, int states, string remark, int genera
         }
 
         /// <summary>
+        /// 执行存储过程
+        /// </summary>
+        /// <param name="execsql"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public bool ExecProc(string execsql, object param)
+        {
+            using (var connection = context.Database.GetDbConnection())
+            {
+                Execute(execsql, param);
+            }
+            return true;
+        }
+
+        /// <summary>
         /// 只支持EXCEL抽取报表数据
         /// </summary>
         /// <param name="import"></param>

performance/Performance.Services/AllotCompute/ResultComputeService.cs

 using AutoMapper;
+using Microsoft.Extensions.Logging;
 using Performance.DtoModels;
 using Performance.EntityModels;
 using Performance.Infrastructure;
@@ -33,6 +34,7 @@ public class ResultComputeService : IAutoInjection
         private readonly LogManageService logManageService;
         private readonly PerforImemployeeclinicRepository perforImemployeeclinicRepository;
         private readonly PerforImemployeelogisticsRepository perforImemployeelogisticsRepository;
+        private readonly ILogger logger;
 
         public ResultComputeService(
             PerforHospitalRepository hospitalRepository,
@@ -50,7 +52,8 @@ public class ResultComputeService : IAutoInjection
             PerforAgsecondallotRepository perforAgsecondallotRepository,
             PerforResreservedRepository perforresreservedRepository,
             PerforImemployeeclinicRepository perforImemployeeclinicRepository,
-            PerforImemployeelogisticsRepository perforImemployeelogisticsRepository)
+            PerforImemployeelogisticsRepository perforImemployeelogisticsRepository,
+            ILogger<ResultComputeService> logger)
         {
             this.baiscNormService = baiscNormService;
             this.computeDirector = computeDirector;
@@ -70,6 +73,7 @@ public class ResultComputeService : IAutoInjection
             this.perforresreservedRepository = perforresreservedRepository;
             this.perforImemployeeclinicRepository = perforImemployeeclinicRepository;
             this.perforImemployeelogisticsRepository = perforImemployeelogisticsRepository;
+            this.logger = logger;
         }
 
         /// <summary>
@@ -214,6 +218,7 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
                         AdjustLaterOtherFee = dept?.AdjustLaterOtherFee ?? 0,
                         NightShiftWorkPerforFee = nightShift,
                     };
+                    logger.LogInformation($"特殊核算组-{group.AccountingUnit},sumValue:{sumValue},预算比例:{dept?.BasicFactor ?? -100}");
                     res.ResultsTotalFee = Math.Round((sumValue * (dept?.BasicFactor ?? 1m)) ?? 0);
                     res.PerforTotal = res.ResultsTotalFee + res.AssessBeforeOtherFee;
                     res.GiveFee = Math.Round((res.PerforTotal * res.ScoringAverage + res.MedicineExtra + res.MaterialsExtra + res.Punishment + res.AssessLaterOtherFee) ?? 0);

performance/Performance.Services/AllotService.cs

@@ -442,9 +442,11 @@ public void Generate(per_allot allot, string mail)
                 perforCofdirectorRepository.SupplementaryData(allot.ID);
 
                 logManageService.WriteMsg("正在生成报表数据", "正在生成报表数据", 1, allot.ID, "ReceiveMessage", true);
-                var res = reportService.ImportData(allot);
-                var flag = reportService.UpdateData(allot);
-                logManageService.WriteMsg("正在生成报表数据", $"报表数据生成完成；受影响：{res}行", 1, allot.ID, "ReceiveMessage", true);
+                //var res = reportService.ImportData(allot);
+                //var flag = reportService.UpdateData(allot);
+                //logManageService.WriteMsg("正在生成报表数据", $"报表数据生成完成；受影响：{res}行", 1, allot.ID, "ReceiveMessage", true);
+                //reportService.ExecProc("call proc_report_performance(@hospitalid, @year, @month);", new { allot.HospitalId, allot.Year, allot.Month });
+
 
                 ////发送邮件
                 //logManageService.WriteMsg("正在发送邮件", "正在发送邮件", 1, allot.ID, "ReceiveMessage", true);

performance/Performance.Services/ReportService.cs

 using Microsoft.Extensions.Logging;
 using Performance.DtoModels;
 using Performance.EntityModels;
+using Performance.Infrastructure;
 using Performance.Repository;
 using System;
 using System.Collections.Generic;
@@ -384,5 +385,22 @@ public List<PerReport> MenuReport(ReportRequest request)
 
             return report;
         }
+
+        /// <summary>
+        /// 执行存储过程
+        /// </summary>
+        /// <param name="allot"></param>
+        /// <returns></returns>
+        public void ExecProc(string execsql, object param)
+        {
+            try
+            {
+                perforPerallotRepository.Execute(execsql, param);
+            }
+            catch (Exception ex)
+            {
+                logger.LogError($"执行存储过程时发生异常，sql：{execsql}；参数：{JsonHelper.Serialize(param)}；异常：{ex.Message}；");
+            }
+        }
     }
 }

performance/Performance.Services/SecondAllotService.cs

@@ -1300,9 +1300,9 @@ bool method(decimal? submitDataAmount, decimal? realGiveFee)
                 if (data == null || !data.Any())
                     throw new PerformanceException("提交时未检测到数据!");
 
-                var total = data.Sum(t => t.RealAmount);
-                if (!method(total, second.RealGiveFee))
-                    throw new PerformanceException("总金额与考核后金额不一致！");
+                //var total = data.Sum(t => t.RealAmount);
+                //if (!method(total, second.RealGiveFee))
+                //    throw new PerformanceException("总金额与考核后金额不一致！");
             }
             else
             {
@@ -1310,10 +1310,10 @@ bool method(decimal? submitDataAmount, decimal? realGiveFee)
                 if (data == null || !data.Any())
                     throw new PerformanceException("提交时未检测到数据!");
 
-                var total = data.Where(t => t.ItemName == "实发绩效工资金额" && t.RowNumber > -1).GroupBy(t => t.RowNumber)
-                    .Sum(t => ConvertHelper.To<decimal>(t.OrderByDescending(o => o.ID).FirstOrDefault().ItemValue));
-                if (!method(total, second.RealGiveFee))
-                    throw new PerformanceException("总金额与考核后金额不一致！");
+                //var total = data.Where(t => t.ItemName == "实发绩效工资金额" && t.RowNumber > -1).GroupBy(t => t.RowNumber)
+                //    .Sum(t => ConvertHelper.To<decimal>(t.OrderByDescending(o => o.ID).FirstOrDefault().ItemValue));
+                //if (!method(total, second.RealGiveFee))
+                //    throw new PerformanceException("总金额与考核后金额不一致！");
             }
             second.UseTempId = temp.UseTempId;
             second.Status = 2;