Merge remote-tracking branch 'origin/v2020morge-graphql' into v2020morge-graphql

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

@@ -445,7 +445,7 @@ public void Generate(per_allot allot, string mail)
                 //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 });
+                //reportService.ExecProc("call proc_report_performance(@hospitalid, @year, @month);", new { allot.HospitalId, allot.Year, allot.Month });
 
 
                 ////发送邮件