带出failedId

performance/Performance.DtoModels/Response/SecondResponse.cs

@@ -23,6 +23,6 @@ public class HeadItem
     public class BodyItem : HeadItem
     {
         public int RowNumber { get; set; }
-        public int Value { get; set; }
+        public string Value { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/ag_compute.cs

@@ -7,40 +7,40 @@
 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 PersonName { get; set; }
-
+    
         /// <summary>
         /// 实发金额
         /// </summary>

performance/Performance.EntityModels/Entity/ag_fixatitem.cs

@@ -7,65 +7,65 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels
+namespace Performance.EntityModels	
 {
     /// <summary>
     /// 二次绩效固定项
     /// </summary>
     [Table("ag_fixatitem")]
-    public class ag_fixatitem
+	public class ag_fixatitem
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-        public int Id { get; set; }
-
+		public int Id { get; set; }
+    
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotId { get; set; }
-
+    
         /// <summary>
         /// 二次绩效ID
         /// </summary>
         public Nullable<int> SecondId { get; set; }
-
+    
         /// <summary>
         /// 
         /// </summary>
         public string UnitType { get; set; }
-
+    
         /// <summary>
         /// 行号
         /// </summary>
         public Nullable<int> RowNumber { get; set; }
-
+    
         /// <summary>
         /// 项目名
         /// </summary>
         public string ItemName { get; set; }
-
+    
         /// <summary>
         /// 值
         /// </summary>
-        public Nullable<decimal> ItemValue { get; set; }
-
+        public string ItemValue { get; set; }
+    
         /// <summary>
         /// 系数
         /// </summary>
         public Nullable<decimal> FactorValue { get; set; }
-
+    
         /// <summary>
         /// 排序
         /// </summary>
         public Nullable<decimal> Sort { get; set; }
-
+    
         /// <summary>
         /// 字段类型 1 顶部概况 2 表格固定 3 工作量
         /// </summary>
         public Nullable<int> Type { get; set; }
-
+    
         /// <summary>
         /// 1 自动带出 2 计算得出
         /// </summary>

performance/Performance.EntityModels/Entity/ag_secondallot.cs

@@ -50,7 +50,7 @@ public class ag_secondallot
         /// 科室实发金额
         /// </summary>
         public Nullable<decimal> RealGiveFee { get; set; }
-
+    
         /// <summary>
         /// 状态 1 未提交  2 提交
         /// </summary>

performance/Performance.Services/SecondAllotService.cs

@@ -380,7 +380,7 @@ public SecondResponse GetSecondDetail(UseTempRequest request)
                         fixatList.AddRange(newItem.Select(t => new ag_fixatitem
                         {
                             ItemName = t,
-                            ItemValue = 0,
+                            ItemValue = null,
                             RowNumber = item.Key,
                             AllotId = fixatList.First().AllotId,
                             SecondId = fixatList.First().SecondId,
@@ -393,6 +393,7 @@ public SecondResponse GetSecondDetail(UseTempRequest request)
                     }
                 }
                 result.BodyItems = Mapper.Map<List<BodyItem>>(fixatList);
+                result.BodyItems.ForEach(t => { t.FiledId = result.HeadItems.FirstOrDefault(s => s.FiledName == t.FiledName)?.FiledId; });
             }
             return result;
         }