实体，修改bug

performance/Performance.EntityModels/Entity/ag_compute.cs

@@ -7,50 +7,50 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels
+namespace Performance.EntityModels	
 {
     /// <summary>
     /// 二次绩效结果表
     /// </summary>
     [Table("ag_compute")]
-    public class ag_compute
+	public class ag_compute
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-        public int Id { get; set; }
-
+		public int Id { get; set; }
+    
         /// <summary>
         /// 绩效ID
         /// </summary>
         public Nullable<int> AllotId { get; set; }
-
+    
         /// <summary>
         /// 二次绩效ID
         /// </summary>
         public Nullable<int> SecondId { get; set; }
-
+    
         /// <summary>
         /// 科室
         /// </summary>
         public string Department { get; set; }
-
+    
         /// <summary>
         /// 职称
         /// </summary>
         public string WorkPost { get; set; }
-
+    
         /// <summary>
         /// 工号
         /// </summary>
         public string JobNumber { get; set; }
-
+    
         /// <summary>
         /// 人员名称
         /// </summary>
         public string PersonName { get; set; }
-
+    
         /// <summary>
         /// 实发金额
         /// </summary>

performance/Performance.EntityModels/Entity/ag_secondallot.cs

@@ -27,6 +27,11 @@ public class ag_secondallot
         public Nullable<int> AllotId { get; set; }
     
         /// <summary>
+        /// 使用模板
+        /// </summary>
+        public Nullable<int> UseTempId { get; set; }
+    
+        /// <summary>
         /// 科室类型
         /// </summary>
         public string UnitType { get; set; }
@@ -55,7 +60,7 @@ public class ag_secondallot
         /// 状态 1 未提交  2 等待审核 3 审核通过 4 驳回
         /// </summary>
         public Nullable<int> Status { get; set; }
-
+    
         /// <summary>
         /// 提交类型 1使用模板 2 其他类型数据
         /// </summary>

performance/Performance.EntityModels/Entity/im_accountbasic.cs

@@ -50,12 +50,17 @@ public class im_accountbasic
         /// 科室
         /// </summary>
         public string Department { get; set; }
-
+    
+        /// <summary>
+        /// 是否带入平均计算 是 否
+        /// </summary>
+        public string IncludeAvgCalculate { get; set; }
+    
         /// <summary>
         /// 定科人数
         /// </summary>
         public Nullable<decimal> PermanentStaff { get; set; }
-
+    
         /// <summary>
         /// 科主任数量
         /// </summary>

performance/Performance.EntityModels/Entity/im_employee_clinic.cs

@@ -65,12 +65,12 @@ public class im_employee_clinic
         /// 职称
         /// </summary>
         public string JobTitle { get; set; }
-
+    
         /// <summary>
         /// 基础绩效系数
         /// </summary>
         public Nullable<decimal> Basics { get; set; }
-
+    
         /// <summary>
         /// 岗位系数
         /// </summary>

performance/Performance.EntityModels/Entity/res_account.cs

@@ -45,7 +45,12 @@ public class res_account
         /// 科室
         /// </summary>
         public string Department { get; set; }
-
+    
+        /// <summary>
+        /// 是否带入平均计算 是 否
+        /// </summary>
+        public string IncludeAvgCalculate { get; set; }
+    
         /// <summary>
         /// 定科人数
         /// </summary>

performance/Performance.Services/SecondAllotService.cs

@@ -333,12 +333,12 @@ private List<BodyItem> GetBodyItems(List<ag_fixatitem> fixatitems, List<HeadItem
                 bodyItems = fixatitems.Select(t => new BodyItem
                 {
                     RowNumber = t.RowNumber.Value,
-                    FiledId = headItems.FirstOrDefault(h => h.FiledName == t.ItemName && h.Type == t.Type)?.FiledId ?? t.ItemName + t.Type,
+                    FiledId = headItems.FirstOrDefault(h => h.FiledName == t.ItemName && h.Type == t.Type)?.FiledId ?? $"{t.ItemName}{t.Type}",
                     FiledName = t.ItemName,
-                    SourceType = t.SourceType.Value,
-                    Type = t.Type.Value,
+                    SourceType = t.SourceType ?? 0,
+                    Type = t.Type ?? 0,
                     Value = t.ItemValue,
-                    Sort = t.Sort.Value
+                    Sort = t.Sort ?? 0
                 }).ToList();
             }
             return bodyItems;