二次绩效工作量占比类型相关实体

performance/Performance.EntityModels/Context/PerformanceDbContext.cs

@@ -38,6 +38,8 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
         public virtual DbSet<ag_usetemp> ag_usetemp { get; set; }
 		/// <summary> 二次绩效工作量绩效 </summary>
         public virtual DbSet<ag_workload> ag_workload { get; set; }
+		/// <summary>  </summary>
+        public virtual DbSet<ag_workload_type> ag_workload_type { get; set; }
 		/// <summary> 考核类别 </summary>
         public virtual DbSet<as_assess> as_assess { get; set; }
 		/// <summary> 考核列头 </summary>

performance/Performance.EntityModels/Entity/ag_fixatitem.cs

@@ -70,7 +70,7 @@ public class ag_fixatitem
         /// 1 自动带出 2 计算得出
         /// </summary>
         public Nullable<int> SourceType { get; set; }
-
+    
         /// <summary>
         /// 1 value相加值为1
         /// </summary>

performance/Performance.EntityModels/Entity/ag_tempitem.cs

@@ -7,55 +7,55 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels
+namespace Performance.EntityModels	
 {
     /// <summary>
     /// 二次绩效模板项
     /// </summary>
     [Table("ag_tempitem")]
-    public class ag_tempitem
+	public class ag_tempitem
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-        public int Id { get; set; }
-
+		public int Id { get; set; }
+    
         /// <summary>
         /// 模板ID
         /// </summary>
         public Nullable<int> TempId { get; set; }
-
+    
         /// <summary>
         /// 字段ID
         /// </summary>
         public string FiledId { get; set; }
-
+    
         /// <summary>
         /// 字段名称
         /// </summary>
         public string FiledName { get; set; }
-
+    
         /// <summary>
         /// 
         /// </summary>
         public Nullable<decimal> Sort { get; set; }
-
+    
         /// <summary>
         /// 字段类型 1 顶部概况 2 表格固定
         /// </summary>
         public Nullable<int> Type { get; set; }
-
+    
         /// <summary>
         /// 1 自动带出 2 计算得出
         /// </summary>
         public Nullable<int> SourceType { get; set; }
-
+    
         /// <summary>
         /// 1 带出历史数据 2不带出
         /// </summary>
         public Nullable<int> IsBring { get; set; }
-
+    
         /// <summary>
         /// 1 value相加值为1
         /// </summary>

performance/Performance.EntityModels/Entity/ag_workload.cs

@@ -55,10 +55,10 @@ public class ag_workload
         /// 
         /// </summary>
         public Nullable<decimal> Sort { get; set; }
-
+    
         /// <summary>
-        /// 1、工作量 2、其他
+        /// 1、单项奖励 2、工作量占比 ..（自定义占比）
         /// </summary>
-        public int Type { get; set; }
+        public int WorkTypeId { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/ag_workload_type.cs

+//-----------------------------------------------------------------------
+// <copyright file=" ag_workload_type.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("ag_workload_type")]
+	public class ag_workload_type
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int HospitalId { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public string TypeName { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/im_accountbasic.cs

@@ -105,17 +105,17 @@ public class im_accountbasic
         /// 其他绩效2
         /// </summary>
         public Nullable<decimal> DoctorOtherPerfor2 { get; set; }
-
+    
         /// <summary>
         /// 药占比奖罚
         /// </summary>
         public Nullable<decimal> MedicineExtra { get; set; }
-
+    
         /// <summary>
         /// 材料占比奖罚
         /// </summary>
         public Nullable<decimal> MaterialsExtra { get; set; }
-
+    
         /// <summary>
         /// 医院奖罚
         /// </summary>

performance/Performance.EntityModels/Entity/per_budget_amount.cs

@@ -25,12 +25,12 @@ public class per_budget_amount
         /// 
         /// </summary>
         public int HospitalId { get; set; }
-
+    
         /// <summary>
         /// 根据该年份测算下一年
         /// </summary>
         public int MainYear { get; set; }
-
+    
         /// <summary>
         /// 实际年份、预算年份
         /// </summary>

performance/Performance.EntityModels/Entity/per_budget_ratio.cs

@@ -25,12 +25,12 @@ public class per_budget_ratio
         /// 
         /// </summary>
         public int HospitalId { get; set; }
-
+    
         /// <summary>
         /// 根据该年份测算下一年
         /// </summary>
         public int MainYear { get; set; }
-
+    
         /// <summary>
         /// 实际年份、预算年份
         /// </summary>

performance/Performance.EntityModels/Entity/per_budget_result.cs

@@ -140,22 +140,22 @@ public class per_budget_result
         /// 成本合计实际比例
         /// </summary>
         public Nullable<decimal> TheCostCombinedRatio { get; set; }
-
+    
         /// <summary>
         /// 人员经费（不含绩效）
         /// </summary>
         public Nullable<decimal> NoPerformanceExpenditure { get; set; }
-
+    
         /// <summary>
         /// 人员经费（不含绩效）实际比例
         /// </summary>
         public Nullable<decimal> NoPerformanceExpenditureRatio { get; set; }
-
+    
         /// <summary>
-        /// 1.初始 2.确认使用发放/调节系数 3.取消使用
+        /// 1.初始 2. 确认使用发放/调节系数
         /// </summary>
         public int States { get; set; }
-
+    
         /// <summary>
         /// 
         /// </summary>

performance/Performance.EntityModels/Entity/res_account.cs

@@ -100,17 +100,17 @@ public class res_account
         /// 其他绩效2
         /// </summary>
         public Nullable<decimal> OtherPerfor2 { get; set; }
-
+    
         /// <summary>
         /// 药占比奖罚
         /// </summary>
         public Nullable<decimal> MedicineExtra { get; set; }
-
+    
         /// <summary>
         /// 材料占比奖罚
         /// </summary>
         public Nullable<decimal> MaterialsExtra { get; set; }
-
+    
         /// <summary>
         /// 医院奖罚
         /// </summary>

performance/Performance.Repository/Repository/PerforAgworkloadtypeRepository.cs

+//-----------------------------------------------------------------------
+// <copyright file=" ag_workload_type.cs">
+// * FileName: ag_workload_type.cs
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using Performance.EntityModels;
+
+namespace Performance.Repository
+{
+    /// <summary>
+    /// ag_workload_type Repository
+    /// </summary>
+    public partial class PerforAgworkloadtypeRepository : PerforRepository<ag_workload_type>
+    {
+		public PerforAgworkloadtypeRepository(PerformanceDbContext context) : base(context)
+        {
+        }
+    }
+}