新增entity,用户角色获取

performance/Performance.EntityModels/Context/PerformanceDbContext.cs

@@ -44,6 +44,8 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
         public virtual DbSet<cof_income> cof_income { get; set; }
 		/// <summary> 工龄对应绩效系数配置 <summary>
         public virtual DbSet<cof_workyear> cof_workyear { get; set; }
+		/// <summary>  <summary>
+        public virtual DbSet<hos_personfee> hos_personfee { get; set; }
 		/// <summary> 科室核算导入信息 <summary>
         public virtual DbSet<im_accountbasic> im_accountbasic { get; set; }
 		/// <summary>  <summary>
@@ -91,6 +93,8 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
 		/// <summary>  <summary>
         public virtual DbSet<sys_sms> sys_sms { get; set; }
 		/// <summary>  <summary>
+        public virtual DbSet<sys_task> sys_task { get; set; }
+		/// <summary>  <summary>
         public virtual DbSet<sys_user> sys_user { get; set; }
 		/// <summary>  <summary>
         public virtual DbSet<sys_user_hospital> sys_user_hospital { get; set; }

performance/Performance.EntityModels/Entity/hos_personfee.cs

+//-----------------------------------------------------------------------
+// <copyright file=" hos_personfee.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("hos_personfee")]
+	public class hos_personfee
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Year { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Month { get; set; }
+    
+        /// <summary>
+        /// 来源 门诊 住院
+        /// </summary>
+        public string Source { get; set; }
+    
+        /// <summary>
+        /// 开单科室
+        /// </summary>
+        public string DeptName { get; set; }
+    
+        /// <summary>
+        /// 费用类型
+        /// </summary>
+        public string Category { get; set; }
+    
+        /// <summary>
+        /// 人次
+        /// </summary>
+        public Nullable<int> PersonTime { get; set; }
+    
+        /// <summary>
+        /// 费用
+        /// </summary>
+        public Nullable<decimal> Fee { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/sys_extract.cs

@@ -27,6 +27,11 @@ public class sys_extract
         public Nullable<int> HospitalId { get; set; }
     
         /// <summary>
+        /// 连接地址
+        /// </summary>
+        public Nullable<int> ConfigId { get; set; }
+    
+        /// <summary>
         /// EXCEL中SHEET名称
         /// </summary>
         public string SheetName { get; set; }

performance/Performance.EntityModels/Entity/sys_hospitalconfig.cs

@@ -45,5 +45,10 @@ public class sys_hospitalconfig
         /// 
         /// </summary>
         public string DbPassword { get; set; }
+    
+        /// <summary>
+        /// 1 标准库 2 绩效库
+        /// </summary>
+        public Nullable<int> Type { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/sys_task.cs

+//-----------------------------------------------------------------------
+// <copyright file=" sys_task.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("sys_task")]
+	public class sys_task
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int id { get; set; }
+    
+        /// <summary>
+        /// 1 标准库 2 绩效库
+        /// </summary>
+        public Nullable<int> type { get; set; }
+    
+        /// <summary>
+        /// 表名
+        /// </summary>
+        public string table_name { get; set; }
+    
+        /// <summary>
+        /// 导入csv
+        /// </summary>
+        public string upload_sql { get; set; }
+    
+        /// <summary>
+        /// 创建临时表
+        /// </summary>
+        public string exec_sql { get; set; }
+    
+        /// <summary>
+        /// bcp导入csv
+        /// </summary>
+        public string export_sql { get; set; }
+    
+        /// <summary>
+        /// 删除历史数据
+        /// </summary>
+        public string delete_sql { get; set; }
+    
+        /// <summary>
+        /// 删除临时表
+        /// </summary>
+        public string end_sql { get; set; }
+    
+        /// <summary>
+        /// 是否有效 1 有效 0 无效
+        /// </summary>
+        public Nullable<int> is_enable { get; set; }
+    }
+}

performance/Performance.Repository/Repository/PerforHospersonfeeRepository.cs

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

performance/Performance.Repository/Repository/PerforTaskRepository.cs

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

performance/Performance.Services/UserService.cs

@@ -100,7 +100,7 @@ public List<UserResponse> GetUserList(int userID)
                     {
                         item.Hospital = string.Join(",", hoslist.Select(p => p.HospitalID.Value));
                     }
-                    var userRole = _userroleRepository.GetEntity(t => t.UserID == userID);
+                    var userRole = _userroleRepository.GetEntity(t => t.UserID == item.UserID);
                     if (userRole != null)
                         item.Role = userRole.RoleID;
                 }