校验数据是，修改提示；行政工勤绩效，参加工作时间数据格式修改

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

@@ -128,6 +128,7 @@ public AutoMapperConfigs()
             CreateMap<per_againallot, AgainAllotResponse>();
             CreateMap<res_compute, ComputeResponse>();
             CreateMap<EmployeeRequest, im_employee>();
+            CreateMap<res_compute, ResComputeResponse>();
         }
     }
 }

performance/Performance.DtoModels/Response/ResComputeResponse.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Performance.DtoModels
+{
+    public class ResComputeResponse
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> AllotID { get; set; }
+
+        /// <summary>
+        /// sheet页id
+        /// </summary>
+        public Nullable<int> SheetID { get; set; }
+
+        /// <summary>
+        /// 核算单元
+        /// </summary>
+        public string AccountingUnit { get; set; }
+
+        /// <summary>
+        /// 绩效基数核算参考对象
+        /// </summary>
+        public string FitPeople { get; set; }
+
+        /// <summary>
+        /// 人员姓名
+        /// </summary>
+        public string EmployeeName { get; set; }
+
+        /// <summary>
+        /// 职称
+        /// </summary>
+        public string JobTitle { get; set; }
+
+        /// <summary>
+        /// 绩效合计(来自科室经济测算表)
+        /// </summary>
+        public Nullable<decimal> PerforTotal { get; set; }
+
+        /// <summary>
+        /// 核算单元医生数量(来自科室经济测算表)
+        /// </summary>
+        public Nullable<decimal> Number { get; set; }
+
+        /// <summary>
+        /// 人均绩效(来自科室经济测算表)
+        /// </summary>
+        public Nullable<decimal> Avg { get; set; }
+
+        /// <summary>
+        /// 效率绩效(需计算)
+        /// </summary>
+        public Nullable<decimal> Efficiency { get; set; }
+
+        /// <summary>
+        /// 规模绩效(需计算)
+        /// </summary>
+        public Nullable<decimal> Scale { get; set; }
+
+        /// <summary>
+        /// 岗位系数
+        /// </summary>
+        public Nullable<decimal> PostCoefficient { get; set; }
+
+        /// <summary>
+        /// 发放系数(来自人员名单)
+        /// </summary>
+        public Nullable<decimal> Grant { get; set; }
+
+        /// <summary>
+        /// 应发管理绩效(需计算，科主任护士长独有)
+        /// </summary>
+        public Nullable<decimal> ShouldGiveFee { get; set; }
+
+        /// <summary>
+        /// 绩效合计(需计算)
+        /// </summary>
+        public Nullable<decimal> PerforSumFee { get; set; }
+
+        /// <summary>
+        /// 考核对分率(来自人员名单)
+        /// </summary>
+        public Nullable<decimal> ScoreAverageRate { get; set; }
+
+        /// <summary>
+        /// 医院奖罚(来自人员名单)
+        /// </summary>
+        public Nullable<decimal> Punishment { get; set; }
+
+        /// <summary>
+        /// 其他绩效(来自人员名单)
+        /// </summary>
+        public Nullable<decimal> OtherPerfor { get; set; }
+
+        /// <summary>
+        /// 应发绩效(需计算)
+        /// </summary>
+        public Nullable<decimal> GiveFee { get; set; }
+
+        /// <summary>
+        /// 出勤率(来自人员名单)
+        /// </summary>
+        public Nullable<decimal> Attendance { get; set; }
+
+        /// <summary>
+        /// 参加工作时间(来自人员名单)
+        /// </summary>
+        public string WorkTime { get; set; }
+
+        /// <summary>
+        /// 绩效基础金额(计算)
+        /// </summary>
+        public Nullable<decimal> BaiscNormValue { get; set; }
+
+        /// <summary>
+        /// 年资系数(来自人员名单)
+        /// </summary>
+        public Nullable<decimal> WorkYear { get; set; }
+
+        /// <summary>
+        /// 调节系数
+        /// </summary>
+        public Nullable<decimal> Adjust { get; set; }
+
+        /// <summary>
+        /// 工作量绩效
+        /// </summary>
+        public Nullable<decimal> Workload { get; set; }
+
+        /// <summary>
+        /// 实发绩效
+        /// </summary>
+        public Nullable<decimal> RealGiveFee { get; set; }
+    }
+}

performance/Performance.Services/AllotCompute/CheckDataService.cs

@@ -34,8 +34,6 @@ internal bool Check(PerExcel excel, per_allot allot)
                 result = false;
 
             //匹配绩效参考标准  
-            //MatchStandard(excel, allot);
-
             //空行数据警告
             if (!CheckData(excel, allot))
                 result = false;
@@ -137,20 +135,6 @@ public bool Discern(PerExcel excel, per_allot allot)
         }
         #endregion        
 
-        #region 匹配绩效参考标准
-        /// <summary>
-        /// 匹配绩效参考标准
-        /// </summary>
-        /// <param name="excel"></param>
-        /// <param name="allot"></param>
-        /// <returns></returns>
-        public bool MatchStandard(PerExcel excel, per_allot allot)
-        {
-
-            return true;
-        }
-        #endregion
-
         #region 空行数据警告
         public bool CheckData(PerExcel excel, per_allot allot)
         {
@@ -243,7 +227,7 @@ public bool CheckData(PerExcel excel, per_allot allot)
                 if (!flag)
                 {
                     result = false;
-                    message = $"{sheet.SheetName} -- 有{count}行空数据，行号是{String.Join("、", rowNumber.ToArray())}；";
+                    message = $"{sheet.SheetName} -- 有{count}行数据不合规范，行号是{String.Join("、", rowNumber.ToArray())}；";
                 }
                 InsertLog(allot.ID, (int)sheet.SheetType, "空行数据警告", message.ToString());
             }

performance/Performance.Services/ComputeService.cs

@@ -48,9 +48,9 @@ public class ComputeService : IAutoInjection
         /// <param name="allotId">绩效ID</param>
         /// <param name="type">绩效基数核算参考对象</param>
         /// <returns></returns>
-        public List<res_compute> GetCompute(int allotId, int type)
+        public List<ResComputeResponse> GetCompute(int allotId, int type)
         {
-            var list = new List<res_compute>();
+            var data = new List<ResComputeResponse>();
             Dictionary<int, List<PerformanceType>> keyValues = new Dictionary<int, List<PerformanceType>>
             {
                 { 1,new List<PerformanceType>{ PerformanceType.ReferenceDirector } },
@@ -63,14 +63,16 @@ public List<res_compute> GetCompute(int allotId, int type)
             if (keyValues.ContainsKey(type))
             {
                 var conList = keyValues[type].Select(t => EnumHelper.GetDescription(t));
-                list = _perforRescomputeRepository.GetEntities(t => t.AllotID == allotId && conList.Contains(t.FitPeople))
+                var list = _perforRescomputeRepository.GetEntities(t => t.AllotID == allotId && conList.Contains(t.FitPeople))
                        .OrderBy(t => t.AccountingUnit).ThenBy(t => t.FitPeople).ToList();
+                data = Mapper.Map<List<ResComputeResponse>>(list);
+                data?.ForEach(t => t.WorkTime = string.IsNullOrEmpty(t.WorkTime) ? null : Convert.ToDateTime(t.WorkTime).ToString("yyyy-MM-dd"));
             }
             else
             {
                 throw new PerformanceException("参数错误，type无效");
             }
-            return Mapper.Map<List<res_compute>>(list);
+            return data;
         }
 
         /// <summary>