Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop

# Conflicts:
#	performance/Performance.Services/PerExcelService/PerExcelService.cs

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

@@ -98,6 +98,11 @@ public AutoMapperConfigs()
             CreateMap<PerDataAccountBaisc, im_accountbasic>();
             CreateMap<PerDataAccountDoctor, res_accountdoctor>();
             CreateMap<PerDataAccountNurse, res_accountnurse>();
+
+            CreateMap<res_accountdoctor, ComputeSource>();
+            CreateMap<res_accountnurse, ComputeSource>();
+            CreateMap<im_employee, ComputeEmployee>();
+            CreateMap<ComputeResult, res_compute>();
         }
     }
 }

performance/Performance.DtoModels/PerExcel/ComputeEmployee.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Performance.DtoModels
+{
+    public class ComputeEmployee
+    {
+        /// <summary>
+        /// 科室类别(例如 医技科室 临床科室 其他科室)
+        /// </summary>
+        public string AccountType { get; set; }
+
+        /// <summary>
+        /// 核算单元
+        /// </summary>
+        public string AccountingUnit { get; set; }
+
+        /// <summary>
+        /// 科室名称
+        /// </summary>
+        public string Department { get; set; }
+
+        /// <summary>
+        /// 绩效基数核算参考对象
+        /// </summary>
+        public string FitPeople { get; set; }
+
+        /// <summary>
+        /// 核算基数
+        /// </summary>
+        public Nullable<decimal> BasicNorm { get; set; }
+
+        /// <summary>
+        /// 医生姓名
+        /// </summary>
+        public string DoctorName { get; set; }
+
+        /// <summary>
+        /// 职称
+        /// </summary>
+        public string JobTitle { get; set; }
+
+        /// <summary>
+        /// 岗位系数
+        /// </summary>
+        public Nullable<decimal> PostCoefficient { get; set; }
+
+        /// <summary>
+        /// 参加工作时间
+        /// </summary>
+        public Nullable<DateTime> WorkTime { get; set; }
+
+        /// <summary>
+        /// 考核得分率
+        /// </summary>
+        public Nullable<decimal> ScoreAverageRate { get; set; }
+
+        /// <summary>
+        /// 出勤率
+        /// </summary>
+        public Nullable<decimal> Attendance { get; set; }
+
+        /// <summary>
+        /// 核算单元医生数
+        /// </summary>
+        public Nullable<int> PeopleNumber { get; set; }
+
+        /// <summary>
+        /// 工作量绩效
+        /// </summary>
+        public Nullable<decimal> Workload { get; set; }
+
+        /// <summary>
+        /// 其他绩效
+        /// </summary>
+        public Nullable<decimal> OtherPerfor { get; set; }
+
+        /// <summary>
+        /// 医院奖罚
+        /// </summary>
+        public Nullable<decimal> Punishment { get; set; }
+
+        /// <summary>
+        /// 调节系数
+        /// </summary>
+        public Nullable<decimal> Adjust { get; set; }
+
+        /// <summary>
+        /// 发放系数
+        /// </summary>
+        public Nullable<decimal> Grant { get; set; }
+    }
+}

performance/Performance.DtoModels/PerExcel/ComputeResult.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Performance.DtoModels
+{
+    public class ComputeResult
+    {
+        /// <summary>
+        /// 科室类别(例如 医技科室 临床科室 其他科室)
+        /// </summary>
+        public string AccountType { 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 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> Attendance { 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<DateTime> WorkTime { get; set; }
+
+        /// <summary>
+        /// 绩效基础金额(计算)
+        /// </summary>
+        public Nullable<decimal> BaiscNormValue { get; set; }
+
+        /// <summary>
+        /// 年资系数(来自人员名单)
+        /// </summary>
+        public Nullable<decimal> WorkYear { get; set; }
+
+    }
+}

performance/Performance.DtoModels/PerExcel/ComputeSource.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Performance.DtoModels
+{
+    public class ComputeSource
+    {
+        /// <summary>
+        /// 核算单元
+        /// </summary>
+        public string AccountingUnit { get; set; }
+
+        /// <summary>
+        /// 核算单元医生数量
+        /// </summary>
+        public Nullable<decimal> Number { get; set; }
+        
+        /// <summary>
+        /// 医生基础系数
+        /// </summary>
+        public Nullable<decimal> BasicFactor { get; set; }
+
+        /// <summary>
+        /// 倾斜系数
+        /// </summary>
+        public Nullable<decimal> SlopeFactor { get; set; }
+
+        /// <summary>
+        /// 其他绩效1
+        /// </summary>
+        public Nullable<decimal> OtherPerfor1 { get; set; }
+
+        /// <summary>
+        /// 其他绩效2
+        /// </summary>
+        public Nullable<decimal> OtherPerfor2 { get; set; }
+
+        /// <summary>
+        /// 医院奖罚
+        /// </summary>
+        public Nullable<decimal> Extra { get; set; }
+
+        /// <summary>
+        /// 考核对分率
+        /// </summary>
+        public Nullable<decimal> ScoringAverage { get; set; }
+
+        /// <summary>
+        /// 调节系数
+        /// </summary>
+        public Nullable<decimal> AdjustFactor { get; set; }
+
+        /// <summary>
+        /// 科室业绩
+        /// </summary>
+        public Nullable<decimal> Income { get; set; }
+
+        /// <summary>
+        /// 业绩绩效
+        /// </summary>
+        public Nullable<decimal> PerforFee { get; set; }
+
+        /// <summary>
+        /// 工作量绩效
+        /// </summary>
+        public Nullable<decimal> WorkloadFee { get; set; }
+
+        /// <summary>
+        /// 绩效合计
+        /// </summary>
+        public Nullable<decimal> PerforTotal { get; set; }
+
+        /// <summary>
+        /// 人均绩效
+        /// </summary>
+        public Nullable<decimal> Avg { get; set; }
+
+        /// <summary>
+        /// 实发绩效
+        /// </summary>
+        public Nullable<decimal> GiveFee { get; set; }
+    }
+}

performance/Performance.DtoModels/PerExcel/ExcelEnum.cs

@@ -45,27 +45,36 @@ public enum SheetType
     }
 
     /// <summary>
-    /// 职位归类 
+    /// 绩效类型 
     /// </summary>
-    public enum EmpolyeeType
+    public enum PerformanceType
     {
-        /// <summary> 院领导 </summary>
-        [Description("院领导")]
-        TopManage = 1,
-        /// <summary> 行政中层 </summary>
-        [Description("行政中层")]
-        MiddleManage = 2,
-        /// <summary> 行政工勤 </summary>
-        [Description("行政工勤")]
-        LogisticsWorkers = 3,
-        /// <summary> 临床科室主任 </summary>
-        [Description("临床科室主任")]
-        Director = 4,
-        /// <summary> 临床科室副主任 </summary>
-        [Description("临床科室副主任")]
-        DeputyDirector = 5,
-        /// <summary> 临床科室护士长 </summary>
-        [Description("临床科室护士长")]
-        Nurse = 6,
+        /// <summary> 没有绩效 </summary>
+        [Description("没有绩效")]
+        Null = 0,
+
+        /// <summary> 科室主任人均绩效 </summary>
+        [Description("科室主任人均绩效")]
+        Director = 1,
+        /// <summary> 科室副主任人均绩效 </summary>
+        [Description("科室副主任人均绩效")]
+        DeputyDirector = 2,
+        /// <summary> 科室护士长人均绩效 </summary>
+        [Description("科室护士长人均绩效")]
+        Nurse = 3,
+
+        /// <summary> 临床科室主任人均绩效 (绩效标准取 科室主任人均绩效) </summary>
+        [Description("临床科室主任人均绩效")]
+        ReferenceDirector = 4,
+        /// <summary> 临床科室中层人均绩效 (绩效标准取 科室主任/护士长/科室副主任/医技主任 平均值) </summary>
+        [Description("临床科室中层人均绩效")]
+        ReferenceDirectorAvg = 5,
+        /// <summary> 临床科室护士人均绩效的95% (绩效标准取 护理组临床科室单元核算表 平均值) </summary>
+        [Description("临床科室护士人均绩效的95%")]
+        ReferenceNurseAvg95 = 6,
+        /// <summary> 临床科室护士长人均绩效 (绩效标准取 护士长 平均值)</summary>
+        [Description("临床科室护士长人均绩效")]
+        ReferenceHeadNurse = 7,
+
     }
 }

performance/Performance.EntityModels/Entity/Sys_User.cs

 //-----------------------------------------------------------------------
 // <copyright file=" sys_user.cs">
 // * FileName: sys_user.cs
-// * history : 2019-03-05 14:05:41 
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels	
 {
     /// <summary>
     /// sys_user Entity Model
     /// </summary>
-    public class sys_user
+    [Table("sys_user")]
+	public class sys_user
     {
         /// <summary>
         /// 

performance/Performance.EntityModels/Entity/cof_director.cs

 //-----------------------------------------------------------------------
 // <copyright file=" cof_director.cs">
 // * FileName: cof_director.cs
-// * history : 2019-03-22 15:48:50 
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels	
 {
     /// <summary>
     /// cof_director Entity Model
     /// </summary>
-    public class cof_director
+    [Table("cof_director")]
+	public class cof_director
     {
         /// <summary>
         /// 
@@ -24,7 +26,7 @@ public class cof_director
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-
+    
         /// <summary>
         /// 
         /// </summary>

performance/Performance.EntityModels/Entity/cof_drugprop.cs

 //-----------------------------------------------------------------------
 // <copyright file=" cof_drugprop.cs">
 // * FileName: cof_drugprop.cs
-// * history : 2019-03-20 16:16:15 
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels	
 {
     /// <summary>
     /// cof_drugprop Entity Model
     /// </summary>
-    public class cof_drugprop
+    [Table("cof_drugprop")]
+	public class cof_drugprop
     {
         /// <summary>
         /// 

performance/Performance.EntityModels/Entity/cof_income.cs

 //-----------------------------------------------------------------------
 // <copyright file=" cof_income.cs">
 // * FileName: cof_income.cs
-// * history : 2019-03-21 15:03:58 
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// cof_income Entity Model
     /// </summary>
+    [Table("cof_income")]
     public class cof_income
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
+        public int ID { get; set; }
 
         /// <summary>
         /// 
@@ -29,12 +31,12 @@ public class cof_income
         /// 关键字匹配
         /// </summary>
         public string SheetNameKeyword { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public string UnitName { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>

performance/Performance.EntityModels/Entity/cof_position.cs

 //-----------------------------------------------------------------------
-// <copyright file=" dic_position.cs">
-// * FileName: dic_position.cs
-// * history : 2019-03-22 15:48:50 
+// <copyright file=" cof_position.cs">
+// * FileName: cof_position.cs
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels
 {
     /// <summary>
-    /// dic_position Entity Model
+    /// cof_position Entity Model
     /// </summary>
+    [Table("cof_position")]
     public class cof_position
     {
         /// <summary>
@@ -21,7 +23,7 @@ public class cof_position
         public int ID { get; set; }
 
         /// <summary>
-        /// 绩效id
+        /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
 
@@ -39,7 +41,7 @@ public class cof_position
         /// 额外补偿系数
         /// </summary>
         public Nullable<decimal> ExtraFactor { get; set; }
-        
+
         /// <summary>
         /// 职位类别 1 普通类别 2 基础绩效来源
         /// </summary>

performance/Performance.EntityModels/Entity/cof_workyear.cs

-//-----------------------------------------------------------------------
-// <copyright file=" cof_income.cs">
-// * FileName: cof_workyear.cs
-// * history : 2019-03-25 13:10:58 
-// </copyright>
-//
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels
 {
-    /// <summary>
-    /// cof_workyear Entity Model
-    /// </summary>
+    [Table("cof_workyear")]
     public class cof_workyear
     {
         /// <summary>
-        /// ID
+        /// 
         /// </summary>
         [Key]
         public int ID { get; set; }
 
         /// <summary>
-        /// 绩效id
+        /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
 
         /// <summary>
-        /// 
+        /// >
         /// </summary>
         public Nullable<decimal> MaxRange { get; set; }
 
         /// <summary>
-        /// 
+        /// <=
         /// </summary>
         public Nullable<decimal> MinRange { get; set; }
 

performance/Performance.EntityModels/Entity/im_accountbasic.cs

 //-----------------------------------------------------------------------
 // <copyright file=" im_accountbasic.cs">
 // * FileName: im_accountbasic.cs
-// * history : 2019-03-20 09:47:33 
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels	
 {
     /// <summary>
     /// im_accountbasic Entity Model
     /// </summary>
-    public class im_accountbasic
+    [Table("im_accountbasic")]
+	public class im_accountbasic
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
 		public int ID { get; set; }
-
+    
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-
+    
         /// <summary>
         /// 
         /// </summary>

performance/Performance.EntityModels/Entity/im_data.cs

 //-----------------------------------------------------------------------
 // <copyright file=" im_data.cs">
 // * FileName: im_data.cs
-// * history : 2019-03-14 10:25:59 
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels
+namespace Performance.EntityModels	
 {
     /// <summary>
     /// im_data Entity Model
     /// </summary>
-    public class im_data
+    [Table("im_data")]
+	public class im_data
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-        public int ID { get; set; }
-
+		public int ID { get; set; }
+    
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-
+    
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> SheetID { get; set; }
-
+    
         /// <summary>
         /// 核算单元类别 1 医生组 2护理组
         /// </summary>
         public Nullable<int> UnitType { get; set; }
-
+    
         /// <summary>
         /// 行号
         /// </summary>
         public Nullable<int> RowNumber { get; set; }
-
+    
         /// <summary>
         /// 核算单元名称
         /// </summary>
         public string AccountingUnit { get; set; }
-
+    
         /// <summary>
         /// 科室名称
         /// </summary>
         public string Department { get; set; }
-
+    
         /// <summary>
         /// 列头类型名称
         /// </summary>
         public string TypeName { get; set; }
-
+    
         /// <summary>
         /// 单元格value
         /// </summary>
         public Nullable<decimal> CellValue { get; set; }
-
+    
         /// <summary>
         /// 1 加 2 减 3 乘
         /// </summary>
         public Nullable<int> ComputRule { get; set; }
-
+    
         /// <summary>
         /// 1 汇总  2原始数据
         /// </summary>
         public Nullable<int> IsTotal { get; set; }
-
+    
         /// <summary>
         /// 是否带入系数计算 1 带入 2 不带入
         /// </summary>
         public Nullable<int> IsFactor { get; set; }
-
+    
         /// <summary>
         /// 系数值
         /// </summary>
         public Nullable<decimal> FactorValue { get; set; }
-
+    
         /// <summary>
         /// 单元格注释
         /// </summary>
         public string Annotation { get; set; }
-
+    
         /// <summary>
         /// 单元格备注
         /// </summary>
         public string Remark { get; set; }
+    
         /// <summary>
-        /// SignID
+        /// 
         /// </summary>
         public string SignID { get; set; }
     }

performance/Performance.EntityModels/Entity/im_employee.cs

 //-----------------------------------------------------------------------
 // <copyright file=" im_employee.cs">
 // * FileName: im_employee.cs
-// * history : 2019-03-08 16:39:35 
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels
+namespace Performance.EntityModels	
 {
     /// <summary>
     /// im_employee Entity Model
     /// </summary>
-    public class im_employee
+    [Table("im_employee")]
+	public class im_employee
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-        public int ID { get; set; }
-
+		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 AccountType { get; set; }
-
+    
         /// <summary>
         /// 核算单元
         /// </summary>
         public string AccountingUnit { get; set; }
-
+    
         /// <summary>
         /// 科室名称
         /// </summary>
         public string Department { get; set; }
-
+    
         /// <summary>
         /// 绩效基数核算参考对象
         /// </summary>
         public string FitPeople { get; set; }
-
+    
         /// <summary>
         /// 医生姓名
         /// </summary>
         public string DoctorName { get; set; }
-
+    
         /// <summary>
         /// 职称
         /// </summary>
         public string JobTitle { get; set; }
-
+    
         /// <summary>
         /// 岗位系数
         /// </summary>
         public Nullable<decimal> PostCoefficient { get; set; }
-
+    
         /// <summary>
         /// 参加工作时间
         /// </summary>
         public Nullable<DateTime> WorkTime { get; set; }
-
+    
         /// <summary>
         /// 考核得分率
         /// </summary>
         public Nullable<decimal> ScoreAverageRate { get; set; }
-
+    
         /// <summary>
         /// 出勤率
         /// </summary>
         public Nullable<decimal> Attendance { get; set; }
-
+    
         /// <summary>
         /// 核算单元医生数
         /// </summary>
         public Nullable<int> PeopleNumber { get; set; }
-
+    
         /// <summary>
         /// 工作量绩效
         /// </summary>
         public Nullable<decimal> Workload { get; set; }
-
+    
         /// <summary>
         /// 其他绩效
         /// </summary>
         public Nullable<decimal> OtherPerfor { get; set; }
-
+    
         /// <summary>
         /// 医院奖罚
         /// </summary>
         public Nullable<decimal> Punishment { get; set; }
-
+    
         /// <summary>
         /// 调节系数
         /// </summary>
         public Nullable<decimal> Adjust { get; set; }
-
+    
         /// <summary>
         /// 发放系数
         /// </summary>

performance/Performance.EntityModels/Entity/im_header.cs

 //-----------------------------------------------------------------------
 // <copyright file=" im_header.cs">
 // * FileName: im_header.cs
-// * history : 2019-03-14 10:25:59 
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels	
 {
     /// <summary>
     /// im_header Entity Model
     /// </summary>
-    public class im_header
+    [Table("im_header")]
+	public class im_header
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
 		public int ID { get; set; }
-
+    
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-
+    
         /// <summary>
         /// 
         /// </summary>
@@ -59,19 +61,20 @@ public class im_header
         /// 合并列
         /// </summary>
         public Nullable<int> MergeCell { get; set; }
-
-        /// <summary>
-        /// 1 汇总  2原始数据
-        /// </summary>
-        public Nullable<int> IsTotal { get; set; }
-
+    
         /// <summary>
         /// 单元格内容
         /// </summary>
         public string CellValue { get; set; }
+    
         /// <summary>
-        /// SignID
+        /// 
         /// </summary>
         public string SignID { get; set; }
+    
+        /// <summary>
+        /// 1 汇总  2原始数据
+        /// </summary>
+        public Nullable<int> IsTotal { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/per_allot.cs

 //-----------------------------------------------------------------------
-// <copyright file=" sys_allot.cs">
-// * FileName: sys_allot.cs
-// * history : 2019-03-06 16:43:26 
+// <copyright file=" per_allot.cs">
+// * FileName: per_allot.cs
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels
+namespace Performance.EntityModels	
 {
     /// <summary>
-    /// sys_allot Entity Model
+    /// per_allot Entity Model
     /// </summary>
-    public class per_allot
+    [Table("per_allot")]
+	public class per_allot
     {
         /// <summary>
         /// ID
         /// </summary>
         [Key]
-        public int ID { get; set; }
-
+		public int ID { get; set; }
+    
         /// <summary>
         /// 医院ID
         /// </summary>
         public int HospitalId { get; set; }
-
+    
         /// <summary>
-        /// CreateUser
+        /// 
         /// </summary>
-        public int? CreateUser { get; set; }
-
+        public Nullable<int> CreateUser { get; set; }
+    
+        /// <summary>
+        /// 绩效统计时间
+        /// </summary>
+        public Nullable<DateTime> CreateDate { get; set; }
+    
         /// <summary>
         /// 绩效发放年
         /// </summary>
         public int Year { get; set; }
-
+    
         /// <summary>
         /// 绩效发放月
         /// </summary>
         public int Month { get; set; }
-
+    
         /// <summary>
         /// 绩效发放总金额
         /// </summary>
         public Nullable<decimal> AllotFee { get; set; }
-
-        /// <summary>
-        /// 绩效统计时间
-        /// </summary>
-        public Nullable<DateTime> CreateDate { get; set; }
-
+    
         /// <summary>
         /// 文件路径
         /// </summary>
         public string Path { get; set; }
-
+    
         /// <summary>
         /// 上传日期
         /// </summary>
         public Nullable<DateTime> UploadDate { get; set; }
-
+    
         /// <summary>
         /// 0 数据未上传 1 数据已上传 2 数据解析中 3 数据解析成功 4 绩效结果生成中 5绩效结果解析成功 6 归档
         /// </summary>

performance/Performance.EntityModels/Entity/per_sheet.cs

 //-----------------------------------------------------------------------
-// <copyright file=" im_sheet.cs">
-// * FileName: im_sheet.cs
-// * history : 2019-03-14 10:25:59 
+// <copyright file=" per_sheet.cs">
+// * FileName: per_sheet.cs
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels	
 {
     /// <summary>
-    /// im_sheet Entity Model
+    /// per_sheet Entity Model
     /// </summary>
-    public class per_sheet
+    [Table("per_sheet")]
+	public class per_sheet
     {
         /// <summary>
         /// ID
@@ -34,9 +36,9 @@ public class per_sheet
         /// 
         /// </summary>
         public Nullable<int> SheetType { get; set; }
-
+    
         /// <summary>
-        /// Դ 1 excel  2 
+        /// 数据来源 1 excel 导入 2 计算
         /// </summary>
         public Nullable<int> Source { get; set; }
     }

performance/Performance.EntityModels/Entity/res_accountdoctor.cs

 //-----------------------------------------------------------------------
-// <copyright file=" im_accountdoctor.cs">
-// * FileName: im_accountdoctor.cs
-// * history : 2019-03-20 09:47:33 
+// <copyright file=" res_accountdoctor.cs">
+// * FileName: res_accountdoctor.cs
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels	
 {
     /// <summary>
-    /// im_accountdoctor Entity Model
+    /// res_accountdoctor Entity Model
     /// </summary>
-    public class res_accountdoctor
+    [Table("res_accountdoctor")]
+	public class res_accountdoctor
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
 		public int ID { get; set; }
-
+    
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-
+    
         /// <summary>
         /// 
         /// </summary>

performance/Performance.EntityModels/Entity/res_accountnurse.cs

 //-----------------------------------------------------------------------
-// <copyright file=" im_accountnurse.cs">
-// * FileName: im_accountnurse.cs
-// * history : 2019-03-20 09:47:33 
+// <copyright file=" res_accountnurse.cs">
+// * FileName: res_accountnurse.cs
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels	
 {
     /// <summary>
-    /// im_accountnurse Entity Model
+    /// res_accountnurse Entity Model
     /// </summary>
-    public class res_accountnurse
+    [Table("res_accountnurse")]
+	public class res_accountnurse
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
 		public int ID { get; set; }
-
+    
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-
+    
         /// <summary>
         /// 
         /// </summary>

performance/Performance.EntityModels/Entity/res_baiscnorm.cs

 //-----------------------------------------------------------------------
 // <copyright file=" res_baiscnorm.cs">
 // * FileName: res_baiscnorm.cs
-// * history : 2019-03-22 15:48:50 
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels	
 {
     /// <summary>
     /// res_baiscnorm Entity Model
     /// </summary>
-    public class res_baiscnorm
+    [Table("res_baiscnorm")]
+	public class res_baiscnorm
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
 		public int ID { get; set; }
-
+    
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-
+    
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> SheetID { get; set; }
-
+    
         /// <summary>
         /// 绩效核算人群
         /// </summary>
@@ -38,16 +40,16 @@ public class res_baiscnorm
         /// <summary>
         /// 绩效总额
         /// </summary>
-        public string TotelValue { get; set; }
+        public Nullable<decimal> TotelValue { get; set; }
     
         /// <summary>
         /// 人均绩效
         /// </summary>
-        public string AvgValue { get; set; }
+        public Nullable<decimal> AvgValue { get; set; }
     
         /// <summary>
         /// 总人数
         /// </summary>
-        public Nullable<int> TotelNumber { get; set; }
+        public Nullable<decimal> TotelNumber { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/res_compute.cs

 //-----------------------------------------------------------------------
 // <copyright file=" res_compute.cs">
 // * FileName: res_compute.cs
-// * history : 2019-03-22 16:41:30 
+// * history : 2019-03-25 19:35:46 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels
+namespace Performance.EntityModels	
 {
     /// <summary>
     /// res_compute Entity Model
     /// </summary>
-    public class res_compute
+    [Table("res_compute")]
+	public class res_compute
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-        public int ID { get; set; }
-
+		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 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> Grant { 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 Nullable<DateTime> WorkTime { get; set; }
+    
+        /// <summary>
+        /// 绩效基础金额(计算)
+        /// </summary>
+        public Nullable<decimal> BaiscNormValue { get; set; }
+    
+        /// <summary>
+        /// 年资系数(来自人员名单)
+        /// </summary>
+        public Nullable<decimal> WorkYear { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/sys_hospital.cs

 //-----------------------------------------------------------------------
 // <copyright file=" sys_hospital.cs">
 // * FileName: sys_hospital.cs
-// * history : 2019-03-05 14:05:41 
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels	
 {
     /// <summary>
     /// sys_hospital Entity Model
     /// </summary>
-    public class sys_hospital
+    [Table("sys_hospital")]
+	public class sys_hospital
     {
         /// <summary>
         /// ID

performance/Performance.EntityModels/Entity/sys_menu.cs

 //-----------------------------------------------------------------------
 // <copyright file=" sys_menu.cs">
 // * FileName: sys_menu.cs
-// * history : 2019-03-05 16:57:57 
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels	
 {
     /// <summary>
     /// sys_menu Entity Model
     /// </summary>
-    public class sys_menu
+    [Table("sys_menu")]
+	public class sys_menu
     {
         /// <summary>
         /// 
@@ -41,14 +43,13 @@ public class sys_menu
         public string MenuIcon { get; set; }
     
         /// <summary>
-        /// 菜单类型 1 首页中出现 2 医院页中出现
+        /// 菜单状态 1 启用 2禁用
         /// </summary>
-        public int MenuType { get; set; }
+        public int States { get; set; }
     
         /// <summary>
-        /// 菜单状态 1 启用 2禁用
+        /// 
         /// </summary>
-        public int States { get; set; }
-        public int Sort { get; set; }
+        public Nullable<int> Sort { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/sys_role.cs

 //-----------------------------------------------------------------------
 // <copyright file=" sys_role.cs">
 // * FileName: sys_role.cs
-// * history : 2019-03-05 16:57:57 
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels	
 {
     /// <summary>
     /// sys_role Entity Model
     /// </summary>
-    public class sys_role
+    [Table("sys_role")]
+	public class sys_role
     {
         /// <summary>
         /// 
@@ -29,7 +31,7 @@ public class sys_role
         /// 
         /// </summary>
         public string Remark { get; set; }
-        
+    
         /// <summary>
         /// 菜单状态 1 启用 2禁用
         /// </summary>

performance/Performance.EntityModels/Entity/sys_role_menu.cs

 //-----------------------------------------------------------------------
 // <copyright file=" sys_role_menu.cs">
 // * FileName: sys_role_menu.cs
-// * history : 2019-03-05 16:57:57 
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels	
 {
     /// <summary>
     /// sys_role_menu Entity Model
     /// </summary>
-    public class sys_role_menu
+    [Table("sys_role_menu")]
+	public class sys_role_menu
     {
         /// <summary>
         /// 
@@ -23,11 +25,11 @@ public class sys_role_menu
         /// <summary>
         /// 
         /// </summary>
-        public Nullable<int> RuleID { get; set; }
+        public int RoleID { get; set; }
     
         /// <summary>
         /// 
         /// </summary>
-        public Nullable<int> MenuID { get; set; }
+        public int MenuID { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/sys_sms.cs

 //-----------------------------------------------------------------------
 // <copyright file=" sys_sms.cs">
 // * FileName: sys_sms.cs
-// * history : 2019-03-05 11:49:50 
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels	
 {
     /// <summary>
     /// sys_sms Entity Model
     /// </summary>
-    public class sys_sms
+    [Table("sys_sms")]
+	public class sys_sms
     {
         /// <summary>
         /// 

performance/Performance.EntityModels/Entity/sys_user_hospital.cs

 //-----------------------------------------------------------------------
 // <copyright file=" sys_user_hospital.cs">
 // * FileName: sys_user_hospital.cs
-// * history : 2019-03-05 11:49:50 
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels	
 {
     /// <summary>
     /// sys_user_hospital Entity Model
     /// </summary>
-    public class sys_user_hospital
+    [Table("sys_user_hospital")]
+	public class sys_user_hospital
     {
         /// <summary>
         /// 

performance/Performance.EntityModels/Entity/sys_user_role.cs

 //-----------------------------------------------------------------------
 // <copyright file=" sys_user_role.cs">
 // * FileName: sys_user_role.cs
-// * history : 2019-03-05 16:57:57 
+// * history : 2019-03-25 11:33:14 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels	
 {
     /// <summary>
     /// sys_user_role Entity Model
     /// </summary>
-    public class sys_user_role
+    [Table("sys_user_role")]
+	public class sys_user_role
     {
         /// <summary>
         /// 
@@ -23,11 +25,11 @@ public class sys_user_role
         /// <summary>
         /// 
         /// </summary>
-        public Nullable<int> RoleID { get; set; }
+        public int RoleID { get; set; }
     
         /// <summary>
         /// 
         /// </summary>
-        public Nullable<int> UserID { get; set; }
+        public int UserID { get; set; }
     }
 }

performance/Performance.Repository/PerforCofworkyearRepository.cs

-//-----------------------------------------------------------------------
-// <copyright file=" dic_position.cs">
+//-----------------------------------------------------------------------
+// <copyright file=" cof_workyear.cs">
 // * FileName: cof_workyear.cs
-// * history : Created by T4 2019-03-25 13:14:55 
+// * history : Created by T4 2019-03-25 11:32:42 
 // </copyright>
-using System;
+//-----------------------------------------------------------------------
+
 using Performance.EntityModels;
+using System;
 
 namespace Performance.Repository
 {
+
+    /// <summary>
+    /// cof_workyear Repository
+    /// </summary>
     public class PerforCofworkyearRepository : PerforRepository<cof_workyear>
     {
         public PerforCofworkyearRepository(PerformanceDbContext context) : base(context)
+
         {
         }
     }

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

+using Performance.DtoModels;
+using Performance.EntityModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Performance.Services
+{
+    public class BaiscNormService : IAutoInjection
+    {
+        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;
+        }
+    }
+}

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

-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Performance.Services
-{
-    /// <summary>
-    /// 临床科室副主任
-    /// </summary>
-    public class ComputeDeputyDirector
-    {
-        public void Compute(List<EntityModels.im_employee> empolyeeList)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

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

-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Performance.Services
-{
-    public class ComputeMedicalTechnician
-    {
-        public void Compute(List<EntityModels.im_employee> empolyeeList)
-        {
-
-        }
-    }
-}

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

-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Performance.Services
-{
-    /// <summary>
-    /// 护士长
-    /// </summary>
-    public class ComputeNurse
-    {
-        public void Compute(List<EntityModels.im_employee> empolyeeList)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

performance/Performance.Services/PerExcelService/NopiSevice.cs

-using NPOI.SS.UserModel;
+using NPOI.HSSF.UserModel;
+using NPOI.SS.UserModel;
 using Performance.Infrastructure;
 using System;
 using System.Collections.Generic;
@@ -24,5 +25,20 @@ public class NopiSevice
             }
             return null;
         }
+
+        public static DateTime? GetCellDatetimeValue(ICell cell)
+        {
+            if (cell != null)
+            {
+                if (cell.CellType == CellType.Numeric)
+                {
+                    if (HSSFDateUtil.IsCellDateFormatted(cell))
+                    {
+                        return cell.DateCellValue;
+                    }
+                }
+            }
+            return null;
+        }
     }
 }

performance/Performance.Services/PerExcelService/SheetDataCompute/PerSheetDataComputeEconomic.cs

@@ -11,7 +11,7 @@ namespace Performance.Services
     /// <summary>
     /// 科室经济核算汇总表 （收入/其他收入/支出）
     /// </summary>
-    public class PerSheetDataComputeEconomic
+    public class PerSheetDataComputeEconomic : IAutoInjection
     {
         #region 合并科室经济
         /// <summary>

performance/Performance.Services/PerExcelService/SheetDataCompute/PerSheetDataComputeWorkload.cs

@@ -11,7 +11,7 @@ namespace Performance.Services
     /// <summary>
     /// 工作量
     /// </summary>
-    public class PerSheetDataComputeWorkload
+    public class PerSheetDataComputeWorkload : IAutoInjection
     {
         #region 工作量一次计算
         /// <summary>

performance/Performance.Services/PerExcelService/SheetDataRead/IPerSheetDataRead.cs

@@ -6,7 +6,7 @@
 
 namespace Performance.Services
 {
-    public interface IPerSheetDataRead
+    public interface IPerSheetDataRead : IAutoInjection
     {
         /// <summary>
         /// excel 列头及数据 配置信息

performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadEmployee.cs

@@ -37,14 +37,14 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
                 {
                     RowNumber = r,
                     AccountingUnit = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元").PointCell).ToString(),
-                    Department = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "科室").PointCell).ToString(),
+                    Department = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元").PointCell).ToString(),
                     DoctorName = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "医生姓名").PointCell).ToString(),
                     JobTitle = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "职称").PointCell).ToString(),
                     FitPeople = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "绩效基数核算参考对象").PointCell).ToString(),
                     AccountType = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元分类").PointCell).ToString(),
                     PostCoefficient = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "岗位系数").PointCell).ToString()),
-                    WorkTime = ConvertHelper.To<DateTime?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "考核得分率").PointCell).ToString()),
-                    ScoreAverageRate = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "医生姓名").PointCell).ToString()),
+                    WorkTime = NopiSevice.GetCellDatetimeValue(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "参加工作时间").PointCell)),
+                    ScoreAverageRate = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "考核得分率").PointCell).ToString()),
                     Attendance = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "出勤率").PointCell).ToString()),
                     PeopleNumber = ConvertHelper.To<int?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元医生数").PointCell).ToString()),
                     Workload = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "工作量绩效").PointCell).ToString()),

performance/Performance.Services/SheetSevice.cs

@@ -101,6 +101,7 @@ private void CommonExport(int sheetID, SheetExportResponse response)
             var headList = _perforImHeaderRepository.GetEntities(t => t.SheetID == sheetID).OrderBy(t => t.PointCell);
 
             var dataList = _perforImDataRepository.GetEntities(t => t.SheetID == sheetID);
+            if (dataList == null || dataList.Count == 0) return;
 
             //创建列头行
             var rowhead = new Row(0);

performance/performance.sln

@@ -12,6 +12,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1.site", "1.site", "{69CFD3FA-0B61-41D4-A9E8-44B933001293}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2.services", "2.services", "{2E5D3959-48C9-4BAD-89BF-9CF1DDCB453D}"
+	ProjectSection(SolutionItems) = preProject
+		Performance.EntityModels\Entity\ComputeResult.cs = Performance.EntityModels\Entity\ComputeResult.cs
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3.repository", "3.repository", "{95E7A23D-DC0E-4C27-AD7C-EAF4917012EF}"
 EndProject
@@ -23,7 +26,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Performance.DtoModels", "Pe
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Performance.EntityModels", "Performance.EntityModels\Performance.EntityModels.csproj", "{F7708C0C-0B0B-4E7E-A995-E39F7044FD11}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Performance.Api", "Performance.Api\Performance.Api.csproj", "{3AE00FF5-F0BA-4D72-A23B-770186309327}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Performance.Api", "Performance.Api\Performance.Api.csproj", "{3AE00FF5-F0BA-4D72-A23B-770186309327}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution