实体修改

performance/Performance.Api/appsettings.Localhost.json

@@ -7,8 +7,8 @@
     }
   },
   "AppConnection": {
-    "PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
-    //"PerformanceConnectionString": "server=192.168.18.166;database=db_yubei;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
+    //"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
+    "PerformanceConnectionString": "server=192.168.18.166;database=db_performance_screen;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
     "HangfireConnectionString": "server=192.168.18.166;database=db_hangfire;uid=root;pwd=1234qwer;port=3306;allow user variables=true;",
     "RedisConnectionString": "116.62.245.55:6379,defaultDatabase=2"
   },

performance/Performance.Api/wwwroot/Performance.Api.xml

@@ -110,6 +110,33 @@
             <param name="userId">用户id</param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.AccountController.SelfInfos">
+            <summary>
+            查询用户信息
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.AccountController.InsertUser(Performance.DtoModels.UserRequest)">
+            <summary>
+            新增用户
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.AccountController.UpdateUser(Performance.DtoModels.UserRequest)">
+            <summary>
+            编辑用户
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.AccountController.DeleteUser(Performance.DtoModels.UserRequest)">
+            <summary>
+            新增用户
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="T:Performance.Api.Controllers.AgainAllotController">
             <summary>
             科室二次分配
@@ -177,6 +204,13 @@
             <param name="form"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.AllotController.ImportExtraction(System.Int32)">
+            <summary>
+            上传文件
+            </summary>
+            <param name="form"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.AllotController.Generate(Performance.DtoModels.AllotRequest)">
             <summary>
             绩效生成

performance/Performance.Api/wwwroot/Performance.DtoModels.xml

@@ -2273,6 +2273,11 @@
             角色
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.UserRequest.RoleArr">
+            <summary>
+            角色Arr
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.UserRequest.HosIDArray">
             <summary>
             用户医院ID

performance/Performance.EntityModels/Entity/ag_compute.cs

@@ -30,6 +30,10 @@ public class ag_compute
         /// 二次绩效ID
         /// </summary>
         public Nullable<int> SecondId { get; set; }
+    
+        /// <summary>
+        /// 科室类型
+        /// </summary>
         public string UnitType { get; set; }
     
         /// <summary>
@@ -58,12 +62,17 @@ public class ag_compute
         public Nullable<decimal> PerforSumFee { get; set; }
     
         /// <summary>
+        /// 管理绩效
+        /// </summary>
+        public Nullable<decimal> PerforManagementFee { get; set; }
+    
+        /// <summary>
         /// 医院其他绩效
         /// </summary>
         public Nullable<decimal> OthePerfor { get; set; }
     
         /// <summary>
-        /// 实发绩效工资金额
+        /// 夜班工作量绩效
         /// </summary>
         public Nullable<decimal> NightWorkPerfor { get; set; }
     

performance/Performance.EntityModels/Entity/ag_secondallot.cs

@@ -57,6 +57,26 @@ public class ag_secondallot
         public Nullable<decimal> RealGiveFee { get; set; }
     
         /// <summary>
+        /// 效率绩效
+        /// </summary>
+        public Nullable<decimal> Efficiency { get; set; }
+    
+        /// <summary>
+        /// 规模绩效
+        /// </summary>
+        public Nullable<decimal> Scale { get; set; }
+    
+        /// <summary>
+        /// 发放系数
+        /// </summary>
+        public Nullable<decimal> Grant { get; set; }
+    
+        /// <summary>
+        /// 应发管理绩效
+        /// </summary>
+        public Nullable<decimal> ShouldGiveFee { get; set; }
+    
+        /// <summary>
         /// 状态 1 未提交  2 等待审核 3 审核通过 4 驳回
         /// </summary>
         public Nullable<int> Status { get; set; }
@@ -87,11 +107,6 @@ public class ag_secondallot
         public string Remark { get; set; }
     
         /// <summary>
-        /// 护理部审核状态 1 未提交  2 等待审核 3 审核通过 4 驳回
-        /// </summary>
-        public Nullable<int> NursingDeptStatus { get; set; }
-
-        /// <summary>
         /// 护理部审核时间
         /// </summary>
         public Nullable<DateTime> NursingDeptAuditTime { get; set; }
@@ -105,5 +120,10 @@ public class ag_secondallot
         /// 护理部备注
         /// </summary>
         public string NursingDeptRemark { get; set; }
+    
+        /// <summary>
+        /// 护理部审核状态 2 等待审核 3 审核通过 4 驳回
+        /// </summary>
+        public Nullable<int> NursingDeptStatus { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/cof_cmi.cs

-////-----------------------------------------------------------------------
-//// <copyright file=" cof_cmi.cs">
-//// * FileName: .cs 
-//// </copyright>
-////-----------------------------------------------------------------------
-//using System;
-//using System.ComponentModel.DataAnnotations;
-//using System.ComponentModel.DataAnnotations.Schema;
+//-----------------------------------------------------------------------
+// <copyright file=" cof_cmi.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
-//namespace Performance.EntityModels	
-//{
-//    /// <summary>
-//    /// 
-//    /// </summary>
-//    [Table("cof_cmi")]
-//	public class cof_cmi
-//    {
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        [Key]
-//		public int Id { get; set; }
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("cof_cmi")]
+	public class cof_cmi
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
     
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        public int AllotId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int AllotId { get; set; }
     
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        public int UnitType { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int UnitType { get; set; }
     
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        public string AccountingUnit { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string AccountingUnit { get; set; }
     
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        public Nullable<decimal> Value { get; set; }
-//    }
-//}
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<decimal> Value { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/cof_drugprop.cs

-////-----------------------------------------------------------------------
-//// <copyright file=" cof_drugprop.cs">
-//// * FileName: 工作量门诊药占比系数.cs 
-//// </copyright>
-////-----------------------------------------------------------------------
-//using System;
-//using System.ComponentModel.DataAnnotations;
-//using System.ComponentModel.DataAnnotations.Schema;
+//-----------------------------------------------------------------------
+// <copyright file=" cof_drugprop.cs">
+// * FileName: 工作量门诊药占比系数.cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
-//namespace Performance.EntityModels	
-//{
-//    /// <summary>
-//    /// 工作量门诊药占比系数
-//    /// </summary>
-//    [Table("cof_drugprop")]
-//	public class cof_drugprop
-//    {
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        [Key]
-//		public int ID { get; set; }
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 工作量门诊药占比系数
+    /// </summary>
+    [Table("cof_drugprop")]
+	public class cof_drugprop
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int ID { get; set; }
     
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        public Nullable<int> AllotID { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> AllotID { get; set; }
     
-//        /// <summary>
-//        /// 药占比最大范围（小于）
-//        /// </summary>
-//        public Nullable<decimal> MaxRange { get; set; }
+        /// <summary>
+        /// 药占比最大范围（小于）
+        /// </summary>
+        public Nullable<decimal> MaxRange { get; set; }
     
-//        /// <summary>
-//        /// 药占比最小范围（大于等于）
-//        /// </summary>
-//        public Nullable<decimal> MinRange { get; set; }
+        /// <summary>
+        /// 药占比最小范围（大于等于）
+        /// </summary>
+        public Nullable<decimal> MinRange { get; set; }
     
-//        /// <summary>
-//        /// 药占比对应系数
-//        /// </summary>
-//        public Nullable<decimal> Value { get; set; }
-//    }
-//}
+        /// <summary>
+        /// 药占比对应系数
+        /// </summary>
+        public Nullable<decimal> Value { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/cof_hrp_department.cs

+//-----------------------------------------------------------------------
+// <copyright file=" cof_hrp_department.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("cof_hrp_department")]
+	public class cof_hrp_department
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int HospitalId { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int AllotId { get; set; }
+    
+        /// <summary>
+        /// HRP人员科室
+        /// </summary>
+        public string HRPDepartment { get; set; }
+    
+        /// <summary>
+        /// 核算单元
+        /// </summary>
+        public string AccountingUnit { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/cof_workloadtype.cs

+//-----------------------------------------------------------------------
+// <copyright file=" cof_workloadtype.cs">
+// * FileName: 工作量分类.cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 工作量分类
+    /// </summary>
+    [Table("cof_workloadtype")]
+	public class cof_workloadtype
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int ID { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> AllotID { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public string SourceType { get; set; }
+    
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Original { get; set; }
+    
+        /// <summary>
+        /// 类别
+        /// </summary>
+        public string Category { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/collect_data.cs

 //-----------------------------------------------------------------------
-// <copyright file=" ag_data.cs">
-// * FileName: 二次分配不固定数据.cs 
+// <copyright file=" collect_data.cs">
+// * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
@@ -10,7 +10,7 @@
 namespace Performance.EntityModels	
 {
     /// <summary>
-    /// 采集数据
+    /// 
     /// </summary>
     [Table("collect_data")]
 	public class collect_data
@@ -32,7 +32,7 @@ public class collect_data
         public string SheetName { get; set; }
     
         /// <summary>
-        /// 
+        /// 核算单元类别 1 医生组 2护理组 3医技组
         /// </summary>
         public string UnitType { get; set; }
     
@@ -45,30 +45,37 @@ public class collect_data
         /// 人员姓名
         /// </summary>
         public string EmployeeName { get; set; }
+    
         /// <summary>
         /// 人员工号
         /// </summary>
         public string JobNumber { get; set; }
+    
         /// <summary>
-        /// 核算单元名称 医技
+        /// 核算单元名称医技
         /// </summary>
         public string AccountingUnitTechnician { get; set; }
+    
         /// <summary>
-        /// 核算单元名称 护士
+        /// 核算单元名称护士
         /// </summary>
         public string AccountingUnitNurse { get; set; }
+    
         /// <summary>
-        /// 核算单元名称 医生
+        /// 核算单元名称医生
         /// </summary>
         public string AccountingUnitDoctor { get; set; }
+    
         /// <summary>
         /// 科室名称
         /// </summary>
         public string Department { get; set; }
+    
         /// <summary>
         /// 列头类型名称
         /// </summary>
         public string TypeName { get; set; }
+    
         /// <summary>
         /// 单元格value
         /// </summary>

performance/Performance.EntityModels/Entity/collect_permission.cs

 //-----------------------------------------------------------------------
-// <copyright file=" ag_data.cs">
-// * FileName: 二次分配不固定数据.cs 
+// <copyright file=" collect_permission.cs">
+// * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
@@ -19,7 +19,7 @@ public class collect_permission
         /// 
         /// </summary>
         [Key]
-        public int ID { get; set; }
+		public int Id { get; set; }
     
         /// <summary>
         /// 
@@ -32,7 +32,12 @@ public class collect_permission
         public int UserId { get; set; }
     
         /// <summary>
-        /// 列头类型名称
+        /// 
+        /// </summary>
+        public int SheetType { get; set; }
+    
+        /// <summary>
+        /// 
         /// </summary>
         public string SheetName { get; set; }
     
@@ -42,18 +47,18 @@ public class collect_permission
         public string HeadName { get; set; }
     
         /// <summary>
-        /// 0 可读可写  1 只读
+        /// 0 可见  1 只读
         /// </summary>
-        public int? Readnoly { get; set; }
+        public int Visible { get; set; }
     
         /// <summary>
-        /// 是否附带上次绩效 0 不附带  1 附带
+        /// 0 可读可写  1 只读
         /// </summary>
-        public int AttachLast { get; set; }
-        public int SheetType { get; set; }
+        public int Readnoly { get; set; }
+    
         /// <summary>
-        /// 0 可见  1 不可见
+        /// 是否附带上次绩效 0 附带  1 不附带
         /// </summary>
-        public int Visible { get; set; }
+        public int AttachLast { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/cust_script.cs

 //-----------------------------------------------------------------------
-// <copyright file="cust_script.cs">
-// * FileName: cust_script.cs 
+// <copyright file=" cust_script.cs">
+// * FileName: 自定义导出.cs 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
@@ -19,26 +19,38 @@ public class cust_script
         /// 
         /// </summary>
         [Key]
-        public int ID { get; set; }
+		public int Id { get; set; }
+    
         /// <summary>
         /// 医院ID
         /// </summary>
         public int HospitalId { get; set; }
+    
         /// <summary>
         /// 是否允许一次分配下载 1 允许 2 禁止
         /// </summary>
         public int IsOnceAllot { get; set; }
+    
         /// <summary>
         /// 是否允许二次分配下载 1 允许 2 禁止
         /// </summary>
         public int IsSecondAllot { get; set; }
     
+        /// <summary>
+        /// 名称
+        /// </summary>
         public string Name { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
         public string Script { get; set; }
+    
         /// <summary>
         /// 配置Id
         /// </summary>
         public int ConfigId { get; set; }
+    
         /// <summary>
         /// 是否可用 1 可用 2 不可用
         /// </summary>

performance/Performance.EntityModels/Entity/his_data.cs

+//-----------------------------------------------------------------------
+// <copyright file=" his_data.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("his_data")]
+	public class his_data
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int HospitalId { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int AllotId { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Year { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Month { get; set; }
+    
+        /// <summary>
+        /// His科室
+        /// </summary>
+        public string HisDepartment { get; set; }
+    
+        /// <summary>
+        /// 核算单元
+        /// </summary>
+        public string AccountingUnit { get; set; }
+    
+        /// <summary>
+        /// 科室
+        /// </summary>
+        public string Department { get; set; }
+    
+        /// <summary>
+        /// 医生姓名
+        /// </summary>
+        public string PersonnelName { get; set; }
+    
+        /// <summary>
+        /// 人员工号
+        /// </summary>
+        public string PersonnelNumber { get; set; }
+    
+        /// <summary>
+        /// 来源
+        /// </summary>
+        public string SourceType { get; set; }
+    
+        /// <summary>
+        /// 费用类型
+        /// </summary>
+        public string Category { get; set; }
+    
+        /// <summary>
+        /// 原始分类
+        /// </summary>
+        public string Original { get; set; }
+    
+        /// <summary>
+        /// 标准分类
+        /// </summary>
+        public string ItemName { get; set; }
+    
+        /// <summary>
+        /// 费用
+        /// </summary>
+        public Nullable<decimal> Value { get; set; }
+    
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public Nullable<DateTime> CreateTime { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/his_import_account.cs

+//-----------------------------------------------------------------------
+// <copyright file=" his_import_account.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("his_import_account")]
+	public class his_import_account
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
+    
+        /// <summary>
+        /// 医院ID
+        /// </summary>
+        public int HospitalId { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> AllotId { get; set; }
+    
+        /// <summary>
+        /// 绩效发放年
+        /// </summary>
+        public int Year { get; set; }
+    
+        /// <summary>
+        /// 绩效发放月
+        /// </summary>
+        public int Month { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public string UnitType { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public string AccountingUnit { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<decimal> Number { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<decimal> RealGiveFee { get; set; }
+    
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public Nullable<DateTime> CreateTime { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/his_import_baiscnorm.cs

+//-----------------------------------------------------------------------
+// <copyright file=" his_import_baiscnorm.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("his_import_baiscnorm")]
+	public class his_import_baiscnorm
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> HospitalId { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> AllotId { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> Year { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> Month { get; set; }
+    
+        /// <summary>
+        /// 绩效核算人群
+        /// </summary>
+        public string PositionName { get; set; }
+    
+        /// <summary>
+        /// 绩效总额
+        /// </summary>
+        public Nullable<decimal> TotelValue { get; set; }
+    
+        /// <summary>
+        /// 人均绩效
+        /// </summary>
+        public Nullable<decimal> AvgValue { get; set; }
+    
+        /// <summary>
+        /// 总人数
+        /// </summary>
+        public Nullable<decimal> TotelNumber { get; set; }
+    
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public Nullable<DateTime> CreateTime { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/his_import_clinic.cs

+//-----------------------------------------------------------------------
+// <copyright file=" his_import_clinic.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("his_import_clinic")]
+	public class his_import_clinic
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
+    
+        /// <summary>
+        /// 医院ID
+        /// </summary>
+        public int HospitalId { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> AllotId { get; set; }
+    
+        /// <summary>
+        /// 绩效发放年
+        /// </summary>
+        public int Year { get; set; }
+    
+        /// <summary>
+        /// 绩效发放月
+        /// </summary>
+        public int Month { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public string UnitType { get; set; }
+    
+        /// <summary>
+        /// 核算单元类型（医技科室、临床科室等）
+        /// </summary>
+        public string AccountType { get; set; }
+    
+        /// <summary>
+        /// 核算单元
+        /// </summary>
+        public string AccountingUnit { get; set; }
+    
+        /// <summary>
+        /// 工号
+        /// </summary>
+        public string JobNumber { get; set; }
+    
+        /// <summary>
+        /// 人员姓名
+        /// </summary>
+        public string EmployeeName { get; set; }
+    
+        /// <summary>
+        /// 基础绩效系数
+        /// </summary>
+        public Nullable<decimal> Basics { get; set; }
+    
+        /// <summary>
+        /// 实发绩效
+        /// </summary>
+        public Nullable<decimal> RealGiveFee { get; set; }
+    
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public Nullable<DateTime> CreateTime { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/his_import_summary.cs

+//-----------------------------------------------------------------------
+// <copyright file=" his_import_summary.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("his_import_summary")]
+	public class his_import_summary
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
+    
+        /// <summary>
+        /// 医院ID
+        /// </summary>
+        public int HospitalId { get; set; }
+    
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int AllotId { get; set; }
+    
+        /// <summary>
+        /// 绩效发放年
+        /// </summary>
+        public int Year { get; set; }
+    
+        /// <summary>
+        /// 绩效发放月
+        /// </summary>
+        public int Month { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public string AccountingUnit { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<decimal> RealGiveFee { get; set; }
+    
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public Nullable<DateTime> CreateTime { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/his_importdata.cs

@@ -85,5 +85,10 @@ public class his_importdata
         /// 值
         /// </summary>
         public Nullable<decimal> Value { get; set; }
+    
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public Nullable<DateTime> CreateTime { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/im_accountbasic.cs

@@ -46,10 +46,10 @@ public class im_accountbasic
         /// </summary>
         public string NurseAccountingUnit { get; set; }
     
-        ///// <summary>
-        ///// 科室
-        ///// </summary>
-        //public string Department { get; set; }
+        /// <summary>
+        /// 科室
+        /// </summary>
+        public string Department { get; set; }
     
         /// <summary>
         /// 是否带入平均计算 是 否
@@ -61,10 +61,10 @@ public class im_accountbasic
         /// </summary>
         public Nullable<decimal> PermanentStaff { get; set; }
     
-        ///// <summary>
-        ///// 科主任数量
-        ///// </summary>
-        //public Nullable<decimal> DoctorDirectorNumber { get; set; }
+        /// <summary>
+        /// 科主任数量
+        /// </summary>
+        public Nullable<decimal> DoctorDirectorNumber { get; set; }
     
         /// <summary>
         /// 核算单元医生数量
@@ -76,10 +76,10 @@ public class im_accountbasic
         /// </summary>
         public Nullable<decimal> DoctorBasicFactor { get; set; }
     
-        ///// <summary>
-        ///// 倾斜系数
-        ///// </summary>
-        //public Nullable<decimal> DoctorSlopeFactor { get; set; }
+        /// <summary>
+        /// 倾斜系数
+        /// </summary>
+        public Nullable<decimal> DoctorSlopeFactor { get; set; }
     
         /// <summary>
         /// 规模绩效系数
@@ -116,9 +116,9 @@ public class im_accountbasic
         /// </summary>
         public Nullable<decimal> MaterialsExtra { get; set; }
     
-        ///// <summary>
-        ///// 医院奖罚
-        ///// </summary>
+        /// <summary>
+        /// 医院奖罚
+        /// </summary>
         public Nullable<decimal> DoctorExtra { get; set; }
     
         /// <summary>
@@ -141,70 +141,70 @@ public class im_accountbasic
         /// </summary>
         public Nullable<decimal> MinimumFactor { get; set; }
     
-        ///// <summary>
-        ///// 护士长人数
-        ///// </summary>
-        //public Nullable<decimal> NurseHeadNumber { get; set; }
-    
-        ///// <summary>
-        ///// 护士人数
-        ///// </summary>
-        //public Nullable<decimal> NurseNumber { get; set; }
-    
-        ///// <summary>
-        ///// 护理基础系数
-        ///// </summary>
-        //public Nullable<decimal> NurseBasicFactor { get; set; }
-    
-        ///// <summary>
-        ///// 倾斜系数
-        ///// </summary>
-        //public Nullable<decimal> NurseSlopeFactor { get; set; }
-    
-        ///// <summary>
-        ///// 规模绩效系数
-        ///// </summary>
-        //public Nullable<decimal> NurseScale { get; set; }
-    
-        ///// <summary>
-        ///// 效率绩效系数
-        ///// </summary>
-        //public Nullable<decimal> NurseEffic { get; set; }
-    
-        ///// <summary>
-        ///// 发放系数
-        ///// </summary>
-        //public Nullable<decimal> NurseGrant { get; set; }
-    
-        ///// <summary>
-        ///// 其他绩效1
-        ///// </summary>
-        //public Nullable<decimal> NurseOtherPerfor1 { get; set; }
-    
-        ///// <summary>
-        ///// 其他绩效2
-        ///// </summary>
-        //public Nullable<decimal> NurseOtherPerfor2 { get; set; }
-    
-        ///// <summary>
-        ///// 医院奖罚
-        ///// </summary>
-        //public Nullable<decimal> NurseExtra { get; set; }
-    
-        ///// <summary>
-        ///// 考核对分率
-        ///// </summary>
-        //public Nullable<decimal> NurseScoringAverage { get; set; }
-    
-        ///// <summary>
-        ///// 调节系数
-        ///// </summary>
-        //public Nullable<decimal> NurseAdjustFactor { get; set; }
-    
-        ///// <summary>
-        ///// 工作量倾斜系数
-        ///// </summary>
-        //public Nullable<decimal> WorkSlopeFactor { get; set; }
+        /// <summary>
+        /// 护士长人数
+        /// </summary>
+        public Nullable<decimal> NurseHeadNumber { get; set; }
+    
+        /// <summary>
+        /// 护士人数
+        /// </summary>
+        public Nullable<decimal> NurseNumber { get; set; }
+    
+        /// <summary>
+        /// 护理基础系数
+        /// </summary>
+        public Nullable<decimal> NurseBasicFactor { get; set; }
+    
+        /// <summary>
+        /// 倾斜系数
+        /// </summary>
+        public Nullable<decimal> NurseSlopeFactor { get; set; }
+    
+        /// <summary>
+        /// 规模绩效系数
+        /// </summary>
+        public Nullable<decimal> NurseScale { get; set; }
+    
+        /// <summary>
+        /// 效率绩效系数
+        /// </summary>
+        public Nullable<decimal> NurseEffic { get; set; }
+    
+        /// <summary>
+        /// 发放系数
+        /// </summary>
+        public Nullable<decimal> NurseGrant { get; set; }
+    
+        /// <summary>
+        /// 其他绩效1
+        /// </summary>
+        public Nullable<decimal> NurseOtherPerfor1 { get; set; }
+    
+        /// <summary>
+        /// 其他绩效2
+        /// </summary>
+        public Nullable<decimal> NurseOtherPerfor2 { get; set; }
+    
+        /// <summary>
+        /// 医院奖罚
+        /// </summary>
+        public Nullable<decimal> NurseExtra { get; set; }
+    
+        /// <summary>
+        /// 考核对分率
+        /// </summary>
+        public Nullable<decimal> NurseScoringAverage { get; set; }
+    
+        /// <summary>
+        /// 调节系数
+        /// </summary>
+        public Nullable<decimal> NurseAdjustFactor { get; set; }
+    
+        /// <summary>
+        /// 工作量倾斜系数
+        /// </summary>
+        public Nullable<decimal> WorkSlopeFactor { get; set; }
     
         /// <summary>
         /// 
@@ -220,10 +220,12 @@ public class im_accountbasic
         /// 考核前其他绩效
         /// </summary>
         public Nullable<decimal> AssessBeforeOtherFee { get; set; }
+    
         /// <summary>
         /// 考核后其他绩效
         /// </summary>
         public Nullable<decimal> AssessLaterOtherFee { get; set; }
+    
         /// <summary>
         /// 调节后其他绩效
         /// </summary>

performance/Performance.EntityModels/Entity/im_data.cs

@@ -42,23 +42,24 @@ public class im_data
         public Nullable<int> RowNumber { get; set; }
     
         /// <summary>
-        /// 核算单元名称
+        /// 人员姓名
         /// </summary>
-        public string AccountingUnit { get; set; }
+        public string EmployeeName { get; set; }
     
         /// <summary>
-        /// 科室名称
+        /// 人员工号
         /// </summary>
-        public string Department { get; set; }
+        public string JobNumber { get; set; }
     
         /// <summary>
-        /// 人员姓名
+        /// 核算单元名称
         /// </summary>
-        public string EmployeeName { get; set; }
+        public string AccountingUnit { get; set; }
+    
         /// <summary>
-        /// 人员工号
+        /// 科室名称
         /// </summary>
-        public string JobNumber { get; set; }
+        public string Department { get; set; }
     
         /// <summary>
         /// 列头类型名称

performance/Performance.EntityModels/Entity/im_employee.cs

@@ -117,6 +117,21 @@ public class im_employee
         public Nullable<decimal> OtherPerfor { get; set; }
     
         /// <summary>
+        /// 其他绩效2
+        /// </summary>
+        public Nullable<decimal> OtherPerfor2 { get; set; }
+    
+        /// <summary>
+        /// 其他绩效3
+        /// </summary>
+        public Nullable<decimal> OtherPerfor3 { get; set; }
+    
+        /// <summary>
+        /// 其他绩效4
+        /// </summary>
+        public Nullable<decimal> OtherPerfor4 { get; set; }
+    
+        /// <summary>
         /// 夜班费
         /// </summary>
         public Nullable<decimal> NightWorkPerfor { get; set; }
@@ -145,14 +160,17 @@ public class im_employee
         /// 
         /// </summary>
         public Nullable<int> UpdateUser { get; set; }
+    
         /// <summary>
         /// 考核前其他绩效
         /// </summary>
         public Nullable<decimal> AssessBeforeOtherFee { get; set; }
+    
         /// <summary>
         /// 考核后其他绩效
         /// </summary>
         public Nullable<decimal> AssessLaterOtherFee { get; set; }
+    
         /// <summary>
         /// 调节后其他绩效
         /// </summary>

performance/Performance.EntityModels/Entity/im_employee_clinic.cs

@@ -72,21 +72,11 @@ public class im_employee_clinic
         public Nullable<decimal> Basics { get; set; }
     
         /// <summary>
-        /// 实际人均绩效
-        /// </summary>
-        public Nullable<decimal> FitPeopleValue { get; set; }
-
-        /// <summary>
         /// 岗位系数
         /// </summary>
         public Nullable<decimal> PostCoefficient { get; set; }
     
         /// <summary>
-        /// 效率绩效人数
-        /// </summary>
-        public Nullable<decimal> PermanentStaff { get; set; }
-
-        /// <summary>
         /// 效率绩效系数
         /// </summary>
         public Nullable<decimal> Efficiency { get; set; }
@@ -102,11 +92,6 @@ public class im_employee_clinic
         public Nullable<decimal> Management { get; set; }
     
         /// <summary>
-        /// 其他管理绩效
-        /// </summary>
-        public Nullable<decimal> OtherManagePerfor { get; set; }
-
-        /// <summary>
         /// 考核得分率
         /// </summary>
         public Nullable<decimal> ScoreAverageRate { get; set; }
@@ -132,6 +117,16 @@ public class im_employee_clinic
         public Nullable<decimal> OtherPerfor { get; set; }
     
         /// <summary>
+        /// 其他管理绩效
+        /// </summary>
+        public Nullable<decimal> OtherManagePerfor { get; set; }
+    
+        /// <summary>
+        /// 夜班费
+        /// </summary>
+        public Nullable<decimal> NightWorkPerfor { get; set; }
+    
+        /// <summary>
         /// 医院奖罚
         /// </summary>
         public Nullable<decimal> Punishment { get; set; }
@@ -155,14 +150,27 @@ public class im_employee_clinic
         /// 
         /// </summary>
         public Nullable<int> UpdateUser { get; set; }
+    
+        /// <summary>
+        /// 效率绩效人数
+        /// </summary>
+        public Nullable<decimal> PermanentStaff { get; set; }
+    
+        /// <summary>
+        /// 实际人均绩效
+        /// </summary>
+        public Nullable<decimal> FitPeopleValue { get; set; }
+    
         /// <summary>
         /// 考核前其他绩效
         /// </summary>
         public Nullable<decimal> AssessBeforeOtherFee { get; set; }
+    
         /// <summary>
         /// 考核后其他绩效
         /// </summary>
         public Nullable<decimal> AssessLaterOtherFee { get; set; }
+    
         /// <summary>
         /// 调节后其他绩效
         /// </summary>

performance/Performance.EntityModels/Entity/im_employee_logistics.cs

 //-----------------------------------------------------------------------
-// <copyright file=" im_employee_clinic.cs">
+// <copyright file=" im_employee_logistics.cs">
 // * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
@@ -72,7 +72,7 @@ public class im_employee_logistics
         public string PersonnelNumber { get; set; }
     
         /// <summary>
-        /// 医生姓名
+        /// 姓名
         /// </summary>
         public string DoctorName { get; set; }
     
@@ -86,11 +86,6 @@ public class im_employee_logistics
         /// </summary>
         public Nullable<decimal> PostCoefficient { get; set; }
     
-        ///// <summary>
-        ///// 参加工作时间
-        ///// </summary>
-        //public Nullable<DateTime> WorkTime { get; set; }
-
         /// <summary>
         /// 考核得分率
         /// </summary>
@@ -101,36 +96,11 @@ public class im_employee_logistics
         /// </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; }
-
         /// <summary>
         /// 
         /// </summary>
@@ -145,10 +115,12 @@ public class im_employee_logistics
         /// 考核前其他绩效
         /// </summary>
         public Nullable<decimal> AssessBeforeOtherFee { get; set; }
+    
         /// <summary>
         /// 考核后其他绩效
         /// </summary>
         public Nullable<decimal> AssessLaterOtherFee { get; set; }
+    
         /// <summary>
         /// 调节后其他绩效
         /// </summary>

performance/Performance.EntityModels/Entity/mod_extract.cs

-////-----------------------------------------------------------------------
-//// <copyright file=" mod_extract.cs">
-//// * FileName: 医院数据提取脚本.cs 
-//// </copyright>
-////-----------------------------------------------------------------------
-//using System;
-//using System.ComponentModel.DataAnnotations;
-//using System.ComponentModel.DataAnnotations.Schema;
-
-//namespace Performance.EntityModels	
-//{
-//    /// <summary>
-//    /// 医院数据提取脚本
-//    /// </summary>
-//    [Table("mod_extract")]
-//	public class mod_extract
-//    {
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        [Key]
-//		public int Id { get; set; }
-    
-//        /// <summary>
-//        /// 医院ID
-//        /// </summary>
-//        public Nullable<int> HospitalId { get; set; }
-    
-//        /// <summary>
-//        /// 当前脚本提取内容名称
-//        /// </summary>
-//        public string EName { get; set; }
-    
-//        /// <summary>
-//        /// 执行脚本
-//        /// </summary>
-//        public string ExecuteScript { get; set; }
-    
-//        /// <summary>
-//        /// 当前脚本类型 1 收入整表  2 单项数据提取
-//        /// </summary>
-//        public Nullable<int> ExecuteType { get; set; }
-    
-//        /// <summary>
-//        /// 数据库来源类型 1 标准库 2 绩效库
-//        /// </summary>
-//        public Nullable<int> SourceType { get; set; }
-    
-//        /// <summary>
-//        /// 描述
-//        /// </summary>
-//        public string Description { get; set; }
-    
-//        /// <summary>
-//        /// 是否可用 1 可用 2 不可用
-//        /// </summary>
-//        public Nullable<int> IsEnable { get; set; }
-//    }
-//}
+//-----------------------------------------------------------------------
+// <copyright file=" mod_extract.cs">
+// * FileName: 医院数据提取脚本.cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 医院数据提取脚本
+    /// </summary>
+    [Table("mod_extract")]
+	public class mod_extract
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
+    
+        /// <summary>
+        /// 医院ID
+        /// </summary>
+        public Nullable<int> HospitalId { get; set; }
+    
+        /// <summary>
+        /// 当前脚本提取内容名称
+        /// </summary>
+        public string EName { get; set; }
+    
+        /// <summary>
+        /// 执行脚本
+        /// </summary>
+        public string ExecuteScript { get; set; }
+    
+        /// <summary>
+        /// 当前脚本类型 1 收入整表  2 单项数据提取
+        /// </summary>
+        public Nullable<int> ExecuteType { get; set; }
+    
+        /// <summary>
+        /// 数据库来源类型 1 标准库 2 绩效库
+        /// </summary>
+        public Nullable<int> SourceType { get; set; }
+    
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string Description { get; set; }
+    
+        /// <summary>
+        /// 是否可用 1 可用 2 不可用
+        /// </summary>
+        public Nullable<int> IsEnable { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/mod_item.cs

-////-----------------------------------------------------------------------
-//// <copyright file=" mod_item.cs">
-//// * FileName: .cs 
-//// </copyright>
-////-----------------------------------------------------------------------
-//using System;
-//using System.ComponentModel.DataAnnotations;
-//using System.ComponentModel.DataAnnotations.Schema;
+//-----------------------------------------------------------------------
+// <copyright file=" mod_item.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
-//namespace Performance.EntityModels	
-//{
-//    /// <summary>
-//    /// 
-//    /// </summary>
-//    [Table("mod_item")]
-//	public class mod_item
-//    {
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        [Key]
-//		public int Id { get; set; }
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("mod_item")]
+	public class mod_item
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
     
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        public Nullable<int> ModuleId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> ModuleId { get; set; }
     
-//        /// <summary>
-//        /// 绩效考核项
-//        /// </summary>
-//        public string ItemName { get; set; }
+        /// <summary>
+        /// 绩效考核项
+        /// </summary>
+        public string ItemName { get; set; }
     
-//        /// <summary>
-//        /// 默认系数或医生系数
-//        /// </summary>
-//        public Nullable<decimal> FactorValue1 { get; set; }
+        /// <summary>
+        /// 默认系数或医生系数
+        /// </summary>
+        public Nullable<decimal> FactorValue1 { get; set; }
     
-//        /// <summary>
-//        /// 护理系数
-//        /// </summary>
-//        public Nullable<decimal> FactorValue2 { get; set; }
+        /// <summary>
+        /// 护理系数
+        /// </summary>
+        public Nullable<decimal> FactorValue2 { get; set; }
     
-//        /// <summary>
-//        /// 医技系数
-//        /// </summary>
-//        public Nullable<decimal> FactorValue3 { get; set; }
+        /// <summary>
+        /// 医技系数
+        /// </summary>
+        public Nullable<decimal> FactorValue3 { get; set; }
     
-//        /// <summary>
-//        /// 抽取绩效值SQL
-//        /// </summary>
-//        public Nullable<int> ExtractId { get; set; }
+        /// <summary>
+        /// 抽取绩效值SQL
+        /// </summary>
+        public Nullable<int> ExtractId { get; set; }
     
-//        /// <summary>
-//        /// 数据库地址
-//        /// </summary>
-//        public Nullable<int> ConfigId { get; set; }
+        /// <summary>
+        /// 数据库地址
+        /// </summary>
+        public Nullable<int> ConfigId { get; set; }
     
-//        /// <summary>
-//        /// 用户选定抽取范围
-//        /// </summary>
-//        public string SelectionRange { get; set; }
+        /// <summary>
+        /// 用户选定抽取范围
+        /// </summary>
+        public string SelectionRange { get; set; }
     
-//        /// <summary>
-//        /// 只读 0、否 1、是
-//        /// </summary>
-//        public Nullable<int> ReadOnly { get; set; }
-//    }
-//}
+        /// <summary>
+        /// 只读 0、否 1、是
+        /// </summary>
+        public Nullable<int> ReadOnly { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/mod_module.cs

-////-----------------------------------------------------------------------
-//// <copyright file=" mod_module.cs">
-//// * FileName: .cs 
-//// </copyright>
-////-----------------------------------------------------------------------
-//using System;
-//using System.ComponentModel.DataAnnotations;
-//using System.ComponentModel.DataAnnotations.Schema;
+//-----------------------------------------------------------------------
+// <copyright file=" mod_module.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
-//namespace Performance.EntityModels	
-//{
-//    /// <summary>
-//    /// 
-//    /// </summary>
-//    [Table("mod_module")]
-//	public class mod_module
-//    {
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        [Key]
-//		public int Id { get; set; }
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("mod_module")]
+	public class mod_module
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
     
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        public Nullable<int> HospitalId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> HospitalId { get; set; }
     
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        public Nullable<int> SheetType { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> SheetType { get; set; }
     
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        public string ModuleName { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ModuleName { get; set; }
     
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        public string Description { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Description { get; set; }
     
-//        /// <summary>
-//        /// 提取脚本ID
-//        /// </summary>
-//        public Nullable<int> ExtractId { get; set; }
+        /// <summary>
+        /// 提取脚本ID
+        /// </summary>
+        public Nullable<int> ExtractId { get; set; }
     
-//        /// <summary>
-//        /// 数据库地址
-//        /// </summary>
-//        public Nullable<int> ConfigId { get; set; }
+        /// <summary>
+        /// 数据库地址
+        /// </summary>
+        public Nullable<int> ConfigId { get; set; }
     
-//        /// <summary>
-//        /// 只读 0、否 1、是
-//        /// </summary>
-//        public Nullable<int> ReadOnly { get; set; }
+        /// <summary>
+        /// 只读 0、否 1、是
+        /// </summary>
+        public Nullable<int> ReadOnly { get; set; }
     
-//        /// <summary>
-//        /// 是否生成Item 0、否 1、是
-//        /// </summary>
-//        public Nullable<int> IsGenerated { get; set; }
-//    }
-//}
+        /// <summary>
+        /// 是否生成Item 0、否 1、是
+        /// </summary>
+        public Nullable<int> IsGenerated { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/mod_special.cs

-////-----------------------------------------------------------------------
-//// <copyright file=" mod_special.cs">
-//// * FileName: .cs 
-//// </copyright>
-////-----------------------------------------------------------------------
-//using System;
-//using System.ComponentModel.DataAnnotations;
-//using System.ComponentModel.DataAnnotations.Schema;
-
-//namespace Performance.EntityModels	
-//{
-//    /// <summary>
-//    /// 
-//    /// </summary>
-//    [Table("mod_special")]
-//	public class mod_special
-//    {
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        [Key]
-//		public int Id { get; set; }
-    
-//        /// <summary>
-//        /// 
-//        /// </summary>
-//        public Nullable<int> HospitalId { get; set; }
-    
-//        /// <summary>
-//        /// 科室
-//        /// </summary>
-//        public string Department { get; set; }
-    
-//        /// <summary>
-//        /// 量化指标
-//        /// </summary>
-//        public string Target { get; set; }
-    
-//        /// <summary>
-//        /// 量化指标绩效分值
-//        /// </summary>
-//        public Nullable<decimal> TargetFactor { get; set; }
-    
-//        /// <summary>
-//        /// 调节系数
-//        /// </summary>
-//        public Nullable<decimal> AdjustFactor { get; set; }
-    
-//        /// <summary>
-//        /// 抽取绩效值SQL
-//        /// </summary>
-//        public Nullable<int> ExtractId { get; set; }
-    
-//        /// <summary>
-//        /// 数据库地址
-//        /// </summary>
-//        public Nullable<int> ConfigId { get; set; }
-//    }
-//}
+//-----------------------------------------------------------------------
+// <copyright file=" mod_special.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("mod_special")]
+	public class mod_special
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> HospitalId { get; set; }
+    
+        /// <summary>
+        /// 科室
+        /// </summary>
+        public string Department { get; set; }
+    
+        /// <summary>
+        /// 量化指标
+        /// </summary>
+        public string Target { get; set; }
+    
+        /// <summary>
+        /// 量化指标绩效分值
+        /// </summary>
+        public Nullable<decimal> TargetFactor { get; set; }
+    
+        /// <summary>
+        /// 调节系数
+        /// </summary>
+        public Nullable<decimal> AdjustFactor { get; set; }
+    
+        /// <summary>
+        /// 抽取绩效值SQL
+        /// </summary>
+        public Nullable<int> ExtractId { get; set; }
+    
+        /// <summary>
+        /// 数据库地址
+        /// </summary>
+        public Nullable<int> ConfigId { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/per_apr_amount.cs

@@ -59,7 +59,7 @@ public class per_apr_amount
         /// <summary>
         /// 状态 1 未提交  2 等待审核 3 审核通过 4 驳回
         /// </summary>
-        public int Status { get; set; }
+        public Nullable<int> Status { get; set; }
     
         /// <summary>
         /// 审核时间
@@ -72,11 +72,6 @@ public class per_apr_amount
         public Nullable<int> AuditUser { get; set; }
     
         /// <summary>
-        /// 备注
-        /// </summary>
-        public string Remark { get; set; }
-
-        /// <summary>
         /// 
         /// </summary>
         public Nullable<DateTime> CreateDate { get; set; }
@@ -85,5 +80,10 @@ public class per_apr_amount
         /// 
         /// </summary>
         public Nullable<int> CreateUser { get; set; }
+    
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/rep_report.cs

@@ -42,6 +42,16 @@ public class rep_report
         public string Title { get; set; }
     
         /// <summary>
+        /// 查询方法名称
+        /// </summary>
+        public string QueryName { get; set; }
+    
+        /// <summary>
+        /// 查询参数
+        /// </summary>
+        public string QueryArguments { get; set; }
+    
+        /// <summary>
         /// X轴标题
         /// </summary>
         public string XTitle { get; set; }

performance/Performance.EntityModels/Entity/report_global.cs

-//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
 // <copyright file=" report_global.cs">
-// * FileName: 条件表.cs
+// * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
@@ -10,7 +10,7 @@
 namespace Performance.EntityModels	
 {
     /// <summary>
-    /// 条件表
+    /// 
     /// </summary>
     [Table("report_global")]
 	public class report_global
@@ -32,12 +32,12 @@ public class report_global
         public string Category { get; set; }
     
         /// <summary>
-        /// 年
+        /// 年份
         /// </summary>
         public Nullable<int> Year { get; set; }
     
         /// <summary>
-        /// 月
+        /// 月份
         /// </summary>
         public Nullable<int> Month { get; set; }
     

performance/Performance.EntityModels/Entity/report_original_persontime.cs

-//-----------------------------------------------------------------------
-// <copyright file=" report_original_workload.cs">
-// * FileName: .cs 
+//-----------------------------------------------------------------------
+// <copyright file=" report_original_persontime.cs">
+// * FileName: 医院门诊住院人次.cs 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
@@ -10,7 +10,7 @@
 namespace Performance.EntityModels	
 {
     /// <summary>
-    /// 
+    /// 医院门诊住院人次
     /// </summary>
     [Table("report_original_persontime")]
 	public class report_original_persontime
@@ -19,7 +19,7 @@ public class report_original_persontime
         /// 
         /// </summary>
         [Key]
-        public int Id { get; set; }
+		public int ID { get; set; }
     
         /// <summary>
         /// 

performance/Performance.EntityModels/Entity/report_original_stays.cs

-//-----------------------------------------------------------------------
-// <copyright file=" report_original_workload.cs">
-// * FileName: .cs 
+//-----------------------------------------------------------------------
+// <copyright file=" report_original_stays.cs">
+// * FileName: 医院门诊住院人次.cs 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
@@ -10,7 +10,7 @@
 namespace Performance.EntityModels	
 {
     /// <summary>
-    /// 
+    /// 医院门诊住院人次
     /// </summary>
     [Table("report_original_stays")]
 	public class report_original_stays
@@ -19,7 +19,7 @@ public class report_original_stays
         /// 
         /// </summary>
         [Key]
-        public int Id { get; set; }
+		public int ID { get; set; }
     
         /// <summary>
         /// 

performance/Performance.EntityModels/Entity/report_original_surgery.cs

-//-----------------------------------------------------------------------
-// <copyright file=" report_original_workload.cs">
-// * FileName: .cs 
+//-----------------------------------------------------------------------
+// <copyright file=" report_original_surgery.cs">
+// * FileName: 医院手术人次.cs 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
@@ -10,7 +10,7 @@
 namespace Performance.EntityModels	
 {
     /// <summary>
-    /// 
+    /// 医院手术人次
     /// </summary>
     [Table("report_original_surgery")]
 	public class report_original_surgery
@@ -19,7 +19,7 @@ public class report_original_surgery
         /// 
         /// </summary>
         [Key]
-        public int Id { get; set; }
+		public int ID { get; set; }
     
         /// <summary>
         /// 

performance/Performance.EntityModels/Entity/report_performance_category.cs

+//-----------------------------------------------------------------------
+// <copyright file=" report_performance_category.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("report_performance_category")]
+	public class report_performance_category
+    {
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Category { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int HospitalId { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Original { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ItemName { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Year { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Month { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/report_performance_person_tags.cs

+//-----------------------------------------------------------------------
+// <copyright file=" report_performance_person_tags.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("report_performance_person_tags")]
+	public class report_performance_person_tags
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int HospitalId { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public string UnitType { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public string AccountingUnit { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public string PersonnelNumber { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public string PersonnelName { get; set; }
+    
+        /// <summary>
+        /// 绩效发放情况
+        /// </summary>
+        public string Tag1 { get; set; }
+    
+        /// <summary>
+        /// 当月绩效权重
+        /// </summary>
+        public string Tag2 { get; set; }
+    
+        /// <summary>
+        /// 重点群体对比1
+        /// </summary>
+        public string Tag3 { get; set; }
+    
+        /// <summary>
+        /// 重点群体对比2
+        /// </summary>
+        public string Tag4 { get; set; }
+    
+        /// <summary>
+        /// 重点群体对比5
+        /// </summary>
+        public string Tag5 { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/report_performance_tags.cs

+//-----------------------------------------------------------------------
+// <copyright file=" report_performance_tags.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("report_performance_tags")]
+	public class report_performance_tags
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int HospitalId { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public string UnitType { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public string AccountingUnit { get; set; }
+    
+        /// <summary>
+        /// 绩效发放情况
+        /// </summary>
+        public string Tag1 { get; set; }
+    
+        /// <summary>
+        /// 当月绩效权重
+        /// </summary>
+        public string Tag2 { get; set; }
+    
+        /// <summary>
+        /// 重点群体对比1
+        /// </summary>
+        public string Tag3 { get; set; }
+    
+        /// <summary>
+        /// 重点群体对比2
+        /// </summary>
+        public string Tag4 { get; set; }
+    
+        /// <summary>
+        /// 重点群体对比5
+        /// </summary>
+        public string Tag5 { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/res_account.cs

@@ -51,15 +51,15 @@ public class res_account
         /// </summary>
         public string IncludeAvgCalculate { get; set; }
     
-        ///// <summary>
-        ///// 定科人数
-        ///// </summary>
-        //public Nullable<decimal> PermanentStaff { get; set; }
+        /// <summary>
+        /// 定科人数
+        /// </summary>
+        public Nullable<decimal> PermanentStaff { get; set; }
     
-        ///// <summary>
-        ///// 科主任/护士长数量
-        ///// </summary>
-        //public Nullable<decimal> ManagerNumber { get; set; }
+        /// <summary>
+        /// 科主任/护士长数量
+        /// </summary>
+        public Nullable<decimal> ManagerNumber { get; set; }
     
         /// <summary>
         /// 核算单元医生数量
@@ -162,33 +162,36 @@ public class res_account
         public Nullable<decimal> RealGiveFee { get; set; }
     
         /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+    
+        /// <summary>
+        /// 变更日志
+        /// </summary>
+        public string ChangeLog { get; set; }
+    
+        /// <summary>
         /// 考核前其他绩效
         /// </summary>
         public Nullable<decimal> AssessBeforeOtherFee { get; set; }
+    
         /// <summary>
         /// 考核后其他绩效
         /// </summary>
         public Nullable<decimal> AssessLaterOtherFee { get; set; }
+    
         /// <summary>
         /// 调节后其他绩效
         /// </summary>
         public Nullable<decimal> AdjustLaterOtherFee { get; set; }
+    
         /// <summary>
         /// 考核后绩效
         /// </summary>
         public Nullable<decimal> AssessLaterPerforTotal { get; set; }
     
         /// <summary>
-        /// 备注
-        /// </summary>
-        public string Remark { get; set; }
-    
-        /// <summary>
-        /// 变更日志
-        /// </summary>
-        public string ChangeLog { get; set; }
-
-        /// <summary>
         /// 是否需要二次分配
         /// </summary>
         public string NeedSecondAllot { get; set; }

performance/Performance.EntityModels/Entity/res_compute.cs

@@ -52,12 +52,12 @@ public class res_compute
         public string FitPeople { get; set; }
     
         /// <summary>
-        /// 绩效基础核算参考值
+        /// 
         /// </summary>
         public Nullable<decimal> FitPeopleValue { get; set; }
     
         /// <summary>
-        /// 绩效基数核算参考对象取值比例（如临床科室护士*95%）
+        /// 
         /// </summary>
         public Nullable<decimal> FitPeopleRatio { get; set; }
     
@@ -92,6 +92,11 @@ public class res_compute
         public Nullable<decimal> Avg { get; set; }
     
         /// <summary>
+        /// 基础绩效系数
+        /// </summary>
+        public Nullable<decimal> Basics { get; set; }
+    
+        /// <summary>
         /// 效率绩效(需计算)
         /// </summary>
         public Nullable<decimal> Efficiency { get; set; }
@@ -137,6 +142,26 @@ public class res_compute
         public Nullable<decimal> OtherPerfor { get; set; }
     
         /// <summary>
+        /// 其他绩效2(来自人员名单)
+        /// </summary>
+        public Nullable<decimal> OtherPerfor2 { get; set; }
+    
+        /// <summary>
+        /// 其他绩效3(来自人员名单)
+        /// </summary>
+        public Nullable<decimal> OtherPerfor3 { get; set; }
+    
+        /// <summary>
+        /// 其他绩效4(来自人员名单)
+        /// </summary>
+        public Nullable<decimal> OtherPerfor4 { get; set; }
+    
+        /// <summary>
+        /// 其他管理绩效(来自人员名单)
+        /// </summary>
+        public Nullable<decimal> OtherManagePerfor { get; set; }
+    
+        /// <summary>
         /// 夜班费
         /// </summary>
         public Nullable<decimal> NightWorkPerfor { get; set; }
@@ -197,11 +222,6 @@ public class res_compute
         public Nullable<decimal> ManagerNumber { get; set; }
     
         /// <summary>
-        /// 其他管理绩效
-        /// </summary>
-        public Nullable<decimal> OtherManagePerfor { get; set; }
-
-        /// <summary>
         /// 核算单元人员数量
         /// </summary>
         public Nullable<decimal> MedicalNumber { get; set; }
@@ -215,16 +235,19 @@ public class res_compute
         /// 考核前其他绩效
         /// </summary>
         public Nullable<decimal> AssessBeforeOtherFee { get; set; }
+    
         /// <summary>
         /// 考核后其他绩效
         /// </summary>
         public Nullable<decimal> AssessLaterOtherFee { get; set; }
+    
         /// <summary>
         /// 调节后其他绩效
         /// </summary>
         public Nullable<decimal> AdjustLaterOtherFee { get; set; }
+    
         /// <summary>
-        /// 是否需要二次分配 是 否
+        /// 是否需要二次分配
         /// </summary>
         public string NeedSecondAllot { get; set; }
     }

performance/Performance.EntityModels/Entity/res_reserved.cs

@@ -31,6 +31,9 @@ public class res_reserved
         /// </summary>
         public int Year { get; set; }
     
+        /// <summary>
+        /// 
+        /// </summary>
         public string UnitType { get; set; }
     
         /// <summary>

performance/Performance.EntityModels/Entity/res_specialunit.cs

@@ -115,18 +115,22 @@ public class res_specialunit
         /// 业绩总绩效
         /// </summary>
         public Nullable<decimal> ResultsTotalFee { get; set; }
+    
         /// <summary>
         /// 考核前绩效
         /// </summary>
         public Nullable<decimal> PerforTotal { get; set; }
+    
         /// <summary>
         /// 考核前其他绩效
         /// </summary>
         public Nullable<decimal> AssessBeforeOtherFee { get; set; }
+    
         /// <summary>
         /// 考核后其他绩效
         /// </summary>
         public Nullable<decimal> AssessLaterOtherFee { get; set; }
+    
         /// <summary>
         /// 调节后其他绩效
         /// </summary>

performance/Performance.EntityModels/Entity/sys_hospital.cs

@@ -101,10 +101,10 @@ public class sys_hospital
         /// </summary>
         public Nullable<int> IsShowSecondDirector { get; set; }
     
-        ///// <summary>
-        ///// 是否开启行政后勤二次绩效分配 1 启用 2 禁用
-        ///// </summary>
-        //public Nullable<int> IsOpenLogisticsSecondAllot { get; set; }
+        /// <summary>
+        /// 是否开启行政后勤二次绩效分配 1 启用 2 禁用
+        /// </summary>
+        public Nullable<int> IsOpenLogisticsSecondAllot { get; set; }
     
         /// <summary>
         /// 抽取项目是否在同一环境 1 是 2 否

performance/Performance.Repository/Repository/PerforCofcmiRepository.cs

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

performance/Performance.Repository/Repository/PerforCofdrugpropRepository.cs

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

performance/Performance.Repository/Repository/PerforCofhrpdepartmentRepository.cs

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

performance/Performance.Repository/Repository/PerforCofworkloadtypeRepository.cs

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

performance/Performance.Repository/Repository/PerforHisdataRepository.cs

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

performance/Performance.Repository/Repository/PerforHisimportaccountRepository.cs

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

performance/Performance.Repository/Repository/PerforHisimportbaiscnormRepository.cs

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

performance/Performance.Repository/Repository/PerforHisimportclinicRepository.cs

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

performance/Performance.Repository/Repository/PerforHisimportsummaryRepository.cs

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

performance/Performance.Repository/Repository/PerforImemployeelogisticsRepository.cs

 //-----------------------------------------------------------------------
-// <copyright file=" im_employee_clinic.cs">
-// * FileName: im_employee_clinic.cs
+// <copyright file=" im_employee_logistics.cs">
+// * FileName: im_employee_logistics.cs
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
@@ -9,7 +9,7 @@
 namespace Performance.Repository
 {
     /// <summary>
-    /// im_employee_clinic Repository
+    /// im_employee_logistics Repository
     /// </summary>
     public partial class PerforImemployeelogisticsRepository : PerforRepository<im_employee_logistics>
     {

performance/Performance.Repository/Repository/PerforModextractRepository.cs

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

performance/Performance.Repository/Repository/PerforModitemRepository.cs

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

performance/Performance.Repository/Repository/PerforModmoduleRepository.cs

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

performance/Performance.Repository/Repository/PerforModspecialRepository.cs

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

performance/Performance.Repository/Repository/PerforPerdeptdicRepository.cs

@@ -4,7 +4,6 @@
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
-using System.Collections.Generic;
 using Performance.EntityModels;
 
 namespace Performance.Repository

performance/Performance.Repository/Repository/PerforReportoriginalpersontimeRepository.cs

 //-----------------------------------------------------------------------
-// <copyright file=" ag_header.cs">
-// * FileName: ag_header.cs
+// <copyright file=" report_original_persontime.cs">
+// * FileName: report_original_persontime.cs
 // </copyright>
 //-----------------------------------------------------------------------
 using System;

performance/Performance.Repository/Repository/PerforReportoriginalstaysRepository.cs

-//-----------------------------------------------------------------------
-// <copyright file=" ag_header.cs">
-// * FileName: ag_header.cs
+//-----------------------------------------------------------------------
+// <copyright file=" report_original_stays.cs">
+// * FileName: report_original_stays.cs
 // </copyright>
 //-----------------------------------------------------------------------
+using System;
 using Performance.EntityModels;
 
 namespace Performance.Repository

performance/Performance.Repository/Repository/PerforReportoriginalsurgeryRepository.cs

-//-----------------------------------------------------------------------
-// <copyright file=" ag_header.cs">
-// * FileName: ag_header.cs
+//-----------------------------------------------------------------------
+// <copyright file=" report_original_surgery.cs">
+// * FileName: report_original_surgery.cs
 // </copyright>
 //-----------------------------------------------------------------------
+using System;
 using Performance.EntityModels;
 
 namespace Performance.Repository

performance/Performance.Repository/Repository/PerforReportperformancecategoryRepository.cs

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

performance/Performance.Repository/Repository/PerforReportperformancepersontagsRepository.cs

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

performance/Performance.Repository/Repository/PerforReportperformancetagsRepository.cs

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

performance/Performance.Repository/Repository/PerforcollectdataRepository.cs

 //-----------------------------------------------------------------------
-// <copyright file=" ag_againsituation.cs">
-// * FileName: ag_againsituation.cs
+// <copyright file=" collect_data.cs">
+// * FileName: collect_data.cs
 // </copyright>
 //-----------------------------------------------------------------------
-using Performance.EntityModels;
 using System;
+using Performance.EntityModels;
 
 namespace Performance.Repository
 {

performance/Performance.Repository/Repository/PerforcollectpermissionRepository.cs

 //-----------------------------------------------------------------------
-// <copyright file=" ag_againsituation.cs">
-// * FileName: ag_againsituation.cs
+// <copyright file=" collect_permission.cs">
+// * FileName: collect_permission.cs
 // </copyright>
 //-----------------------------------------------------------------------
-using Performance.EntityModels;
 using System;
+using Performance.EntityModels;
 
 namespace Performance.Repository
 {

performance/Performance.Repository/Repository/PerforcustscriptRepository.cs

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

performance/Performance.Repository/Repository/PerforresreservedRepository.cs

 //-----------------------------------------------------------------------
-// <copyright file=" cof_guarantee.cs">
-// * FileName: cof_guarantee.cs
+// <copyright file=" res_reserved.cs">
+// * FileName: res_reserved.cs
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
@@ -9,11 +9,11 @@
 namespace Performance.Repository
 {
     /// <summary>
-    /// cof_guarantee Repository
+    /// res_reserved Repository
     /// </summary>
-    public partial class PerforresreservedRepository : PerforRepository<res_reserved>
+    public partial class PerforResreservedRepository : PerforRepository<res_reserved>
     {
-		public PerforresreservedRepository(PerformanceDbContext context) : base(context)
+		public PerforResreservedRepository(PerformanceDbContext context) : base(context)
         {
         }
     }

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -22,7 +22,7 @@ public class ResultComputeService : IAutoInjection
         private readonly PerforPerallotRepository perforPerallotRepository;
         private readonly PerforAgcomputeRepository perforAgcomputeRepository;
         private readonly PerforAgsecondallotRepository perforAgsecondallotRepository;
-        private readonly PerforresreservedRepository perforresreservedRepository;
+        private readonly PerforResreservedRepository perforresreservedRepository;
         private readonly PerforHospitalRepository hospitalRepository;
         private readonly PerforImemployeeRepository perforImEmployeeRepository;
         private readonly PerforRescomputeRepository perforRescomputeRepository;
@@ -48,7 +48,7 @@ public class ResultComputeService : IAutoInjection
             PerforPerallotRepository perforPerallotRepository,
             PerforAgcomputeRepository perforAgcomputeRepository,
             PerforAgsecondallotRepository perforAgsecondallotRepository,
-            PerforresreservedRepository perforresreservedRepository,
+            PerforResreservedRepository perforresreservedRepository,
             PerforImemployeeclinicRepository perforImemployeeclinicRepository,
             PerforImemployeelogisticsRepository perforImemployeelogisticsRepository)
         {

performance/Performance.Services/AllotService.cs

@@ -26,7 +26,7 @@ public class AllotService : IAutoInjection
         private ProcessComputService processComputService;
         private ResultComputeService resultComputeService;
         private PerforLogdbugRepository logdbug;
-        private readonly PerforresreservedRepository perforresreservedRepository;
+        private readonly PerforResreservedRepository perforresreservedRepository;
         private ConfigService configService;
         private IHostingEnvironment _evn;
         private ILogger<AllotService> _logger;
@@ -59,7 +59,7 @@ public class AllotService : IAutoInjection
              ResultComputeService resultComputeService,
              ConfigService configService,
              PerforLogdbugRepository logdbug,
-             PerforresreservedRepository perforresreservedRepository,
+             PerforResreservedRepository perforresreservedRepository,
              IHostingEnvironment evn, ILogger<AllotService> logger,
              IEmailService emailService,
              IOptions<Application> options,

performance/Performance.Services/CollectService.cs

@@ -125,7 +125,7 @@ into emppmss
                               SheetName = sh.SheetName,
                               SheetType = sh.SheetType.Value,
                               HeadName = sh.HeadName,
-                              PermissionId = item?.ID,
+                              PermissionId = item?.Id,
                               Readnoly = item?.Readnoly ?? 0,
                               AttachLast = item?.AttachLast ?? 0,
                               Visible = item?.Visible ?? 0
@@ -160,7 +160,7 @@ public void SetPermission(int userid, IEnumerable<CollectPermission> collects)
             if (data3 != null)
             {
                 var ids = data3.Select(t => t.PermissionId).ToList();
-                var deletes = perforcollectpermissionRepository.GetEntities(w => ids.Contains(w.ID));
+                var deletes = perforcollectpermissionRepository.GetEntities(w => ids.Contains(w.Id));
                 if (deletes != null)
                     perforcollectpermissionRepository.RemoveRange(deletes.ToArray());
             }
@@ -170,14 +170,14 @@ public void SetPermission(int userid, IEnumerable<CollectPermission> collects)
             if (data1 != null)
             {
                 var ids = data1.Select(t => t.PermissionId).ToList();
-                var updates = perforcollectpermissionRepository.GetEntities(w => ids.Contains(w.ID));
+                var updates = perforcollectpermissionRepository.GetEntities(w => ids.Contains(w.Id));
                 if (updates != null)
                 {
                     foreach (var item in updates)
                     {
-                        item.AttachLast = data1.FirstOrDefault(w => w.PermissionId == item.ID).AttachLast;
-                        item.Readnoly = data1.FirstOrDefault(w => w.PermissionId == item.ID).Readnoly;
-                        item.Visible = data1.FirstOrDefault(w => w.PermissionId == item.ID).Visible;
+                        item.AttachLast = data1.FirstOrDefault(w => w.PermissionId == item.Id).AttachLast;
+                        item.Readnoly = data1.FirstOrDefault(w => w.PermissionId == item.Id).Readnoly;
+                        item.Visible = data1.FirstOrDefault(w => w.PermissionId == item.Id).Visible;
                     }
                     perforcollectpermissionRepository.UpdateRange(updates.ToArray());
                 }

performance/Performance.Services/CustomExtractService.cs

@@ -25,7 +25,7 @@ public class CustomExtractService : IAutoInjection
         private readonly PerforPerallotRepository _perallotRepository;
         private readonly PerforPerdeptdicRepository _perforPerdeptdicRepository;
         private readonly PerforHospitalconfigRepository _perforHospitalconfigRepository;
-        private readonly PerforcustscriptRepository _perforcustscriptRepository;
+        private readonly PerforCustscriptRepository _perforcustscriptRepository;
 
         public CustomExtractService(
             ILogger<CustomExtractService> logger,
@@ -35,7 +35,7 @@ public class CustomExtractService : IAutoInjection
             PerforPerallotRepository perallotRepository,
             PerforPerdeptdicRepository perforPerdeptdicRepository,
             PerforHospitalconfigRepository perforHospitalconfigRepository,
-            PerforcustscriptRepository perforcustscriptRepository)
+            PerforCustscriptRepository perforcustscriptRepository)
         {
             _logger = logger;
             _options = options;