公式注释不用的

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

@@ -115,7 +115,7 @@ public AutoMapperConfigs()
                  .ForMember(dest => dest.DoctorNumber, opt => opt.MapFrom(src => src.Number))
                  .ForMember(dest => dest.DoctorBasicFactor, opt => opt.MapFrom(src => src.BasicFactor))
                  //.ForMember(dest => dest.DoctorSlopeFactor, opt => opt.MapFrom(src => src.SlopeFactor))
-                 .ForMember(dest => dest.DoctorOtherPerfor1, opt => opt.MapFrom(src => src.OtherPerfor1))
+                 //.ForMember(dest => dest.DoctorOtherPerfor1, opt => opt.MapFrom(src => src.OtherPerfor1))
                  //.ForMember(dest => dest.DoctorOtherPerfor2, opt => opt.MapFrom(src => src.OtherPerfor2))
                  //.ForMember(dest => dest.DoctorExtra, opt => opt.MapFrom(src => src.Extra))
                  .ForMember(dest => dest.DoctorScoringAverage, opt => opt.MapFrom(src => src.ScoringAverage))

performance/Performance.DtoModels/PerExcel/PerDataAccountBaisc.cs

@@ -63,10 +63,10 @@ public class PerDataAccountBaisc : IPerData
         ///// </summary>
         //public decimal SlopeFactor { get; set; }
 
-        /// <summary>
-        /// 其他绩效1
-        /// </summary>
-        public decimal OtherPerfor1 { get; set; }
+        ///// <summary>
+        ///// 其他绩效1
+        ///// </summary>
+        //public decimal OtherPerfor1 { get; set; }
 
         /// <summary>
         /// 考核前其他绩效

performance/Performance.DtoModels/PerExcel/PerDataClinicEmployee.cs

@@ -101,10 +101,10 @@ public class PerDataClinicEmployee : IPerData
         /// </summary>
         public Nullable<decimal> OtherManagePerfor { get; set; }
 
-        /// <summary>
-        /// 其他绩效
-        /// </summary>
-        public Nullable<decimal> OthePerfor { get; set; }
+        ///// <summary>
+        ///// 其他绩效
+        ///// </summary>
+        //public Nullable<decimal> OthePerfor { get; set; }
 
         ///// <summary>
         ///// 夜班费

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -312,7 +312,8 @@ public void Save(List<PerSheet> perSheets, int allotId)
                         dept.MedicineExtra = (drugExtra ?? 0);
                         dept.MaterialsExtra = (materialsExtra ?? 0);
                         dept.PerforFee = dept.Income * dept.BasicFactor;
-                        dept.PerforTotal = Math.Round((dept.PerforFee + dept.WorkloadFee + dept.OtherPerfor1 + dept.AssessBeforeOtherFee) ?? 0);
+                        //dept.PerforTotal = Math.Round((dept.PerforFee + dept.WorkloadFee + dept.OtherPerfor1 + dept.AssessBeforeOtherFee) ?? 0);
+                        dept.PerforTotal = Math.Round((dept.PerforFee + dept.WorkloadFee + dept.AssessBeforeOtherFee) ?? 0);
                         dept.AssessLaterPerforTotal = Math.Round((dept.PerforTotal * dept.ScoringAverage + dept.MedicineExtra + dept.MaterialsExtra + dept.Extra + dept.AssessLaterOtherFee) ?? 0);
                         dept.RealGiveFee = Math.Round((dept.AssessLaterPerforTotal * dept.AdjustFactor + dept.AdjustLaterOtherFee) ?? 0);
                         //dept.Avg = dept.ManagerNumber + dept.Number == 0 ? 0 : dept.PerforTotal / (dept.ManagerNumber + dept.Number);

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -196,7 +196,7 @@ public class ResultComputeService : IAutoInjection
                         QuantitativeFee = item.Quantity * item.QuantitativeIndicatorsValue * headcount,
                         //ScoringAverage = scoreAverage.HasValue ? scoreAverage : dept?.ScoringAverage, 
                         ScoringAverage = dept?.ScoringAverage ?? 0,
-                        OtherPerfor = dept?.OtherPerfor1,
+                        //OtherPerfor = dept?.OtherPerfor1,
                         Punishment = (extra ?? 0),
                         MedicineExtra = (drugExtra ?? 0),
                         MaterialsExtra = (materialsExtra ?? 0),

performance/Performance.Services/ComputeService.cs

@@ -930,7 +930,7 @@ public DeptDataDetails SpecialDeptDetail(ag_secondallot second)
                     AccountingUnit = second.Department,
                     //Department = second.Department,
                     ScoringAverage = special.FirstOrDefault()?.ScoringAverage ?? 0,
-                    OtherPerfor1 = special.FirstOrDefault()?.OtherPerfor ?? 0,
+                    //OtherPerfor1 = special.FirstOrDefault()?.OtherPerfor ?? 0,
                     AdjustFactor = special.FirstOrDefault()?.Adjust ?? 0,
                     Avg = special.FirstOrDefault()?.Avg,
                     RealGiveFee = special.FirstOrDefault()?.RealGiveFee,

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

@@ -383,7 +383,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
                         ScoreAverageRate = empolyee.ScoreAverageRate ?? 0,
                         AssessLaterOtherFee = empolyee.AssessLaterOtherFee ?? 0,
                         AdjustLaterOtherFee = empolyee.AdjustLaterOtherFee ?? 0,
-                        OtherPerfor = empolyee.OtherPerfor ?? 0,
+                        //OtherPerfor = empolyee.OtherPerfor ?? 0,
                         OtherManagePerfor = empolyee.OtherManagePerfor ?? 0,
                         Number = resAccount.Number,
                         PerforTotal = resAccount.PerforTotal,

performance/Performance.Services/PerExcelService/ExcelReadConfig.cs

@@ -48,7 +48,7 @@ public class ExcelReadConfig
             new ColumnInfo(nameof(PerDataClinicEmployee.AssessLaterOtherFee), "考核后其他绩效", true),
             new ColumnInfo(nameof(PerDataClinicEmployee.Attendance), "出勤率", true),
             new ColumnInfo(nameof(PerDataClinicEmployee.OtherManagePerfor), "其他管理绩效"),
-            new ColumnInfo(nameof(PerDataClinicEmployee.OthePerfor), "其他绩效"),
+            //new ColumnInfo(nameof(PerDataClinicEmployee.OthePerfor), "其他绩效"),
             //new ColumnInfo(nameof(PerDataClinicEmployee.NightWorkPerfor), "夜班费"),
             new ColumnInfo(nameof(PerDataClinicEmployee.Adjust), "调节系数", true),
             new ColumnInfo(nameof(PerDataClinicEmployee.AdjustLaterOtherFee), "调节后其他绩效", true),
@@ -78,7 +78,7 @@ public class ExcelReadConfig
             //new ColumnInfo(nameof(PerDataAccountBaisc.ManagerNumber), "科主任/护士长人数", true),
             new ColumnInfo(nameof(PerDataAccountBaisc.Number), "核算单元人员数量", true),
             new ColumnInfo(nameof(PerDataAccountBaisc.BasicFactor), "预算比例", true),
-            new ColumnInfo(nameof(PerDataAccountBaisc.OtherPerfor1), "其他绩效1", true),
+            //new ColumnInfo(nameof(PerDataAccountBaisc.OtherPerfor1), "其他绩效1", true),
             new ColumnInfo(nameof(PerDataAccountBaisc.AssessBeforeOtherFee), "考核前其他绩效", true),
             new ColumnInfo(nameof(PerDataAccountBaisc.ScoringAverage), "考核得分率", true),
             new ColumnInfo(nameof(PerDataAccountBaisc.AssessLaterOtherFee), "考核后其他绩效", true),