Merge branch 'v2020morge' into v2020morge-signalr

# Conflicts:
#	performance/Performance.Api/wwwroot/Performance.Api.xml
#	performance/Performance.Api/wwwroot/Performance.EntityModels.xml
#	performance/Performance.EntityModels/Context/PerformanceDbContext.cs
#	performance/Performance.Services/AllotService.cs

performance/Performance.Api/Controllers/AllotController.cs

@@ -263,6 +263,16 @@ public ApiResponse Generate([CustomizeValidator(RuleSet = "Delete"), FromBody] A
             ////BackgroundJob.Enqueue(() => _allotService.Generate(allot, email));
             return new ApiResponse(ResponseType.OK);
         }
+        /*
+        [Route("recalculation")]
+        [HttpPost]
+        public ApiResponse Recalculation([FromBody] RecalculationRequest request)
+        {
+            if (request.Money.HasValue && request.Money.Value > 0)
+                _allotService.Recalculation(request.AllotId, request.Money.Value);
+            return new ApiResponse(ResponseType.OK);
+        }
+        */
         
         /// <summary>
         /// 重新计算院领导绩效

performance/Performance.Api/Controllers/ComputeController.cs

@@ -13,6 +13,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using Performance.DtoModels.Request;
 
 namespace Performance.Api.Controllers
 {
@@ -22,12 +23,15 @@ public class ComputeController : Controller
         private ComputeService _computeService;
         private AllotService _allotService;
         private ClaimService _claim;
+        private EmployeeService _employeeService;
         public ComputeController(AllotService allotService,
             ComputeService computeService,
+            EmployeeService employeeService,
             ClaimService claim)
         {
             _allotService = allotService;
             _computeService = computeService;
+            _employeeService = employeeService;
             _claim = claim;
         }
 
@@ -253,7 +257,7 @@ public ApiResponse AllComputeAvg([FromBody] ComputerRequest request)
             //            ? 0 : Math.Round(gc.Sum(s => s.RealGiveFee) / gc.Select(p => new { p.JobNumber, p.EmployeeName }).Distinct().Count() ?? 0)
             //    }));
 
-            return new ApiResponse(ResponseType.OK, "ok", avgs.Select(w => new { w.PositionName, w.TotelNumber, w.TotelValue, w.AvgValue }));
+            return new ApiResponse(ResponseType.OK, "ok", avgs.Select(w => new {w.ID, w.PositionName, w.TotelNumber, w.TotelValue, w.AvgValue }));
         }
 
         /// <summary>
@@ -366,5 +370,45 @@ public ApiResponse DoctorDetail(int computeId)
             var result = _computeService.GetDoctorDetail(computeId);
             return new ApiResponse(ResponseType.OK, result);
         }
+
+        #region 人均绩效修改
+
+        /// <summary>
+        /// 编辑全院绩效平均
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("EditHospitalAvg")]
+        [HttpPost]
+        public ApiResponse<res_baiscnorm> EditHospitalAvg([FromBody] ComputerAvgRequest request)
+        {
+            var allot = _allotService.GetAllot(request.AllotId);
+            if (null == allot)
+                throw new PerformanceException("当前绩效记录不存在");
+
+            var result = _computeService.EditHospitalAvg(request);
+
+            return new ApiResponse<res_baiscnorm>(ResponseType.OK,  result);
+        }
+
+        #endregion
+
+        #region 其他绩效统计
+        /// <summary>
+        /// 其他医院绩效统计
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("OtherPerStats/{allotId}")]
+        [HttpPost]
+        public ApiResponse OtherPerStats(int allotId)
+        {
+            var employee = _employeeService.GetAprList(allotId, _claim.GetUserId());
+            
+            var relust= _computeService.GetOtherPerStats(employee);
+            return new ApiResponse(ResponseType.OK,relust);
+        }
+
+        #endregion
     }
 }
\ No newline at end of file

performance/Performance.Api/Controllers/ConfigController.cs

@@ -535,5 +535,44 @@ public ApiResponse WorkHeader([CustomizeValidator(RuleSet = "Select"), FromBody]
             var list = _configService.WorkHeader(request.AllotID);
             return new ApiResponse(ResponseType.OK, "ok", list);
         }
+
+        #region HRP人员科室
+        
+        /// <summary>
+        /// 获取HRP人员科室
+        /// </summary>
+        /// <param name="hospitalId"></param>
+        /// <param name="allotId"></param>
+        /// <returns></returns>
+        [Route("hrpdepthands/{hospitalId}/allot/{allotId}")]
+        [HttpPost]
+        public ApiResponse GetHrpDeptHands([FromRoute] int hospitalId, int allotId)
+        {
+            if (hospitalId <= 0)
+                return new ApiResponse(ResponseType.Fail, "参数错误", "HospitalId无效");
+            if (allotId <= 0)
+                return new ApiResponse(ResponseType.Fail, "参数错误", "allotid无效");
+
+            var relust = _configService.GetHrpDeptHands(hospitalId, allotId);
+            return new ApiResponse(ResponseType.OK, relust);
+        }
+
+        /// <summary>
+        /// 保存HRP人员科室
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns></returns>
+        [Route("savehrpdept/{hospitalId}/allot/{allotId}")]
+        [HttpPost]
+        public ApiResponse SaveHrpDept(int hospitalId, int allotId, [FromBody] SaveCollectData request)
+        {
+            if (hospitalId <= 0)
+                return new ApiResponse(ResponseType.Fail, "参数错误", "HospitalId无效");
+            if (allotId <= 0)
+                return new ApiResponse(ResponseType.Fail, "参数错误", "allotid无效"); 
+            _configService.SaveDepttypeHands(hospitalId, allotId, request);
+            return new ApiResponse(ResponseType.OK);
+        }
+        #endregion
     }
 }
\ No newline at end of file

performance/Performance.Api/Controllers/EmployeeController.cs

@@ -466,5 +466,20 @@ public ApiResponse<List<TitleValue>> GetPerforTypeDict([FromRoute] int allotId)
             var result = employeeService.GetPerforTypeDict(allotId);
             return new ApiResponse<List<TitleValue>>(ResponseType.OK, "绩效类型字典", result);
         }
+
+        /// <summary>
+        /// 材料科室考核
+        /// </summary>
+        /// <returns></returns>
+        [Route("deptAssessment/{allotId}")]
+        [HttpPost]
+        public ApiResponse GetDeptAssessment(int allotId)
+        {
+            if (allotId<=0)
+                return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
+
+            var result=employeeService.GetDeptAssessment(allotId);
+            return new ApiResponse(ResponseType.OK,result);
+        }
     }
 }

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -401,11 +401,11 @@ public ApiResponse NursingDeptAuditResult([FromBody] SecondAuditRequest request)
         [HttpPost]
         public ApiResponse OtherList([FromBody] AgOtherRequest request)
         {
-            //var result = secondAllotService.OtherList(request.SecondId, claimService.GetUserId());
-            var result = secondAllotDetails.GetOtherTempData(claimService.GetUserId(), request.SecondId, request.IsArchive, request.EmployeeSource, out decimal? realAmount);
+            var result = secondAllotDetails.GetOtherTempDetails(claimService.GetUserId(), request.SecondId, request.IsArchive, request.EmployeeSource);
+            //var result = secondAllotDetails.GetOtherTempData(claimService.GetUserId(), request.SecondId, request.IsArchive, request.EmployeeSource, out decimal? realAmount);
             var obj = new
             {
-                header = secondAllotService.OtherListHeader(request.SecondId, realAmount),
+                header = secondAllotService.OtherListHeader(request.SecondId, result?.Sum(t=>t.RealAmount)),
                 body = result,
             };
             return new ApiResponse(ResponseType.OK, obj);

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

@@ -208,7 +208,7 @@
             <summary>
             上传文件
             </summary>
-            <param name="allotId"></param>
+            <param name="form"></param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.AllotController.Generate(Performance.DtoModels.AllotRequest)">
@@ -467,6 +467,20 @@
             <param name="computeId"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.ComputeController.EditHospitalAvg(Performance.DtoModels.Request.ComputerAvgRequest)">
+            <summary>
+            编辑全院绩效平均
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ComputeController.OtherPerStats(System.Int32)">
+            <summary>
+            其他医院绩效统计
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.ConfigController.GetDrugtypeList(Performance.DtoModels.DrugpropRequest)">
             <summary>
             获取 药占比类型信息列表
@@ -756,6 +770,12 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetDeptAssessment(System.Int32)">
+            <summary>
+            材料科室考核
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.ExConfigController.Extract(Performance.DtoModels.ModModuleRequest)">
             <summary>
             绩效数据抽取模板

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

@@ -1169,6 +1169,11 @@
             是否需要二次分配
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.PerDataAccountBaisc.NightShiftWorkPerforFee">
+            <summary>
+            夜班绩效
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.PerDataClinicEmployee.UnitType">
             <summary>
             核算单元分类
@@ -1823,6 +1828,26 @@
         <member name="P:Performance.DtoModels.AprAmountAuditRequest.Remark">
             <summary> 备注 </summary>
         </member>
+        <member name="P:Performance.DtoModels.Request.ComputerAvgRequest.PositionName">
+            <summary>
+            绩效核算人群
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Request.ComputerAvgRequest.TotelValue">
+            <summary>
+            绩效总额
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Request.ComputerAvgRequest.AvgValue">
+            <summary>
+            人均绩效
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Request.ComputerAvgRequest.TotelNumber">
+            <summary>
+            总人数
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.Request.SmsCodeRequest.Type">
             <summary>
             短信验证类型 1 手机号登录 2 其他
@@ -3026,7 +3051,7 @@
         </member>
         <member name="P:Performance.DtoModels.DeptResponse.PerforTotal">
             <summary>
-            绩效合计
+            考核前绩效合计
             </summary>
         </member>
         <member name="P:Performance.DtoModels.DeptResponse.Avg">

performance/Performance.DtoModels/PerExcel/PerDataAccountBaisc.cs

@@ -237,6 +237,11 @@ public class PerDataAccountBaisc : IPerData
         /// </summary>
         public string NeedSecondAllot { get; set; }
 
+        /// <summary>
+        /// 夜班绩效
+        /// </summary>
+        public Nullable<decimal> NightShiftWorkPerforFee { get; set; }
+
         #endregion 由计算得出
     }
 }

performance/Performance.DtoModels/Request/ComputerAvgRequest.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using FluentValidation;
+
+namespace Performance.DtoModels.Request
+{
+    public class ComputerAvgRequest
+    {
+        public int Id { get; set; }
+        public int AllotId { get; set; }
+        public int SheetId { get; set; }
+        /// <summary>
+        /// 绩效核算人群
+        /// </summary>
+        public string PositionName { get; set; }
+        /// <summary>
+        /// 绩效总额
+        /// </summary>
+        public decimal TotelValue { get; set; }
+        /// <summary>
+        /// 人均绩效
+        /// </summary>
+        public decimal AvgValue { get; set; }
+        /// <summary>
+        /// 总人数
+        /// </summary>
+        public decimal TotelNumber { get; set; }
+    }
+    public class ComputerRequestValidator : AbstractValidator<ComputerAvgRequest>
+    {
+        public ComputerRequestValidator()
+        {
+            RuleFor(x => x.Id).NotNull();
+            RuleFor(x => x.AllotId).NotNull().GreaterThan(0);
+            RuleFor(x => x.PositionName).NotNull().NotEmpty();
+            RuleFor(x => x.TotelNumber).NotNull();
+            RuleFor(x => x.TotelValue).NotNull();
+            RuleFor(x => x.AvgValue).NotNull();
+        }
+    }
+}

performance/Performance.DtoModels/Response/DeptResponse.cs

@@ -129,7 +129,7 @@ public class DeptResponse
         public Nullable<decimal> WorkloadFee { get; set; }
 
         /// <summary>
-        /// 绩效合计
+        /// 考核前绩效合计
         /// </summary>
         public Nullable<decimal> PerforTotal { get; set; }
 

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,14 @@ public class ag_secondallot
         /// 护理部备注
         /// </summary>
         public string NursingDeptRemark { get; set; }
+    
+        /// <summary>
+        /// 护理部审核状态 2 等待审核 3 审核通过 4 驳回
+        /// </summary>
+        public Nullable<int> NursingDeptStatus { get; set; }
+        /// <summary>
+        /// 夜班绩效
+        /// </summary>
+        public decimal? NightShiftWorkPerforFee { 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>
+        [Key]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int HospitalId { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Year { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Month { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Category { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Original { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ItemName { 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; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public Nullable<DateTime> CreateTime { 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; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public Nullable<DateTime> CreateTime { 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,35 +162,42 @@ 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; }
+        /// <summary>
+        /// 夜班绩效
+        /// </summary>
+        public Nullable<decimal> NightShiftWorkPerforFee { 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,21 +115,29 @@ 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>
         public Nullable<decimal> AdjustLaterOtherFee { get; set; }
+        /// <summary>
+        /// 夜班绩效
+        /// </summary>
+        public Nullable<decimal> NightShiftWorkPerforFee { get; set; }
     }
 }

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/PerforCofHrpDeptRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Performance.EntityModels;
+
+namespace Performance.Repository.Repository
+{
+    public partial class PerforCofHrpDeptRepository:PerforRepository<cof_hrp_department>
+    {
+        public PerforCofHrpDeptRepository(PerformanceDbContext context) : base(context)
+        {
+
+        }
+    }
+}

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/ProcessComputService.cs

@@ -268,6 +268,7 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, per_allot
             var economicData = perSheet.FirstOrDefault(t => t.SheetType == SheetType.ComputeEconomic)?.PerData?.Select(t => (PerData)t);
             var doctorWorkloadData = perSheet.FirstOrDefault(t => t.SheetType == SheetType.ComputeDoctorWorkload)?.PerData?.Select(t => (PerData)t);
             var nurseWorkloadData = perSheet.FirstOrDefault(t => t.SheetType == SheetType.ComputeNurseWorkload)?.PerData?.Select(t => (PerData)t);
+            var accountExtraData = excel.PerSheet.FirstOrDefault(t => t.SheetType == SheetType.AccountExtra)?.PerData?.Select(t => (PerData)t);
 
             var pairs = new[]
             {
@@ -301,7 +302,10 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, per_allot
                         }
                         if (UnitType.医技组 == unitType && workDoctor == null)
                             workDoctor = info.Data.FirstOrDefault(t => t.UnitType == UnitType.医生组.ToString() && t.AccountingUnit == dept.AccountingUnit);
+                        // 夜班绩效 从医院奖罚的明细项中获取
+                        var nightShift = accountExtraData.FirstOrDefault(w => w.UnitType == dept.UnitType && w.AccountingUnit == dept.AccountingUnit && w.TypeName?.Trim() == "夜班绩效")?.CellValue ?? 0;
 
+                        dept.NightShiftWorkPerforFee = nightShift;
                         //dept.MedicineFactor = workDoctor?.MedicineFactor;
                         //dept.ScoringAverage = scoreAverage.HasValue ? scoreAverage ?? 0 : dept.ScoringAverage;
                         dept.ScoringAverage = dept.ScoringAverage;
@@ -325,6 +329,7 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, per_allot
                         dept.RealGiveFee = Math.Round((dept.AssessLaterPerforTotal * dept.AdjustFactor + dept.AdjustLaterOtherFee) ?? 0);
                         //dept.Avg = dept.ManagerNumber + dept.Number == 0 ? 0 : dept.PerforTotal / (dept.ManagerNumber + dept.Number);
                         dept.Avg = dept.Number == 0 ? 0 : dept.PerforTotal / dept.Number;
+
                     }
 
                     sheet.PerData.AddRange(atDataList);
@@ -370,28 +375,46 @@ public void ComputeOffice(per_allot allot, PerExcel excel)
                 //var materialsExtra = materialsExtras.FirstOrDefault(w => w.UnitType == account.AccountType.ToString() && w.AccountingUnit == resAccount.AccountingUnit)?.TotelValue;
 
                 var dept = new PerDataAccountBaisc();
-                //dept.ManagerNumber = resAccount?.ManagerNumber ?? 0;
                 dept.Number = empolyees.Count();
                 dept.AccountingUnit = account.AccountingUnit;
                 dept.UnitType = account.AccountType;
-                dept.ScoringAverage = resAccount?.ScoringAverage == null ? 0 : resAccount.ScoringAverage;
-                dept.AdjustFactor = (isBudget ? adjust : resAccount?.AdjustFactor) ?? 1;
                 dept.Income = empolyees.Sum(w => w.PerforTotal ?? 0);
                 dept.NeedSecondAllot = empolyees.Any(w => w.NeedSecondAllot == "是") ? "是" : "否";
-                //dept.Extra = (extra ?? 0);
-                //dept.MedicineExtra = 0;// (drugExtra ?? 0);
-                //dept.MaterialsExtra = 0;//(materialsExtra ?? 0);
+
+                if (resAccount?.UnitType == UnitType.行政后勤.ToString() && resAccount?.NeedSecondAllot == "是")
+                {
+                    dept.ScoringAverage = resAccount?.ScoringAverage == null ? 0 : resAccount.ScoringAverage;
+                    dept.AdjustFactor = (isBudget ? adjust : resAccount?.AdjustFactor) ?? 1;
                     dept.Extra = resAccount?.Extra ?? 0;
                     dept.MedicineExtra = resAccount?.MedicineExtra ?? 0;// (drugExtra ?? 0);
                     dept.MaterialsExtra = resAccount?.MaterialsExtra ?? 0;//(materialsExtra ?? 0);
 
                     dept.AssessBeforeOtherFee = resAccount?.AssessBeforeOtherFee ?? 0;
                     dept.AssessLaterOtherFee = resAccount?.AssessLaterOtherFee ?? 0;
-                dept.AdjustLaterOtherFee = resAccount?.AdjustLaterOtherFee ?? 0;
+                    // 行政后勤 没有 调节后其他绩效
+                    //dept.AdjustLaterOtherFee = resAccount?.AdjustLaterOtherFee ?? 0;
+                }
+                else
+                {
+                    dept.ScoringAverage = 1;
+                    dept.AdjustFactor = 1;
+                    dept.Extra = empolyees?.Sum(w => w.Punishment) ?? 0;
+                    dept.MedicineExtra = 0;// (drugExtra ?? 0);
+                    dept.MaterialsExtra = 0;//(materialsExtra ?? 0);
+
+                    dept.AssessBeforeOtherFee = empolyees?.Sum(w => w.AssessBeforeOtherFee) ?? 0;
+                    dept.AssessLaterOtherFee = empolyees?.Sum(w => w.AssessLaterOtherFee) ?? 0;
+                    dept.AdjustLaterOtherFee = empolyees?.Sum(w => w.AdjustLaterOtherFee) ?? 0;
+                }
+
+                //dept.Extra = (extra ?? 0);
+                //dept.MedicineExtra = 0;// (drugExtra ?? 0);
+                //dept.MaterialsExtra = 0;//(materialsExtra ?? 0);
+
 
                 dept.PerforFee = empolyees.Sum(w => w.PerforTotal ?? 0);
                 dept.PerforTotal = Math.Round(empolyees.Sum(w => w.GiveFee ?? 0));
-                dept.RealGiveFee = Math.Round(((dept.PerforTotal * dept.ScoringAverage + dept.MedicineExtra + dept.MaterialsExtra + dept.Extra) * dept.AdjustFactor) ?? 0);
+                dept.RealGiveFee = Math.Round(((dept.PerforTotal * dept.ScoringAverage + dept.MedicineExtra + dept.MaterialsExtra + dept.Extra) * dept.AdjustFactor + dept.AdjustLaterOtherFee) ?? 0);
                 //dept.Avg = dept.ManagerNumber + dept.Number == 0 ? 0 : dept.PerforTotal / (dept.ManagerNumber + dept.Number);
                 dept.Avg = dept.Number == 0 ? 0 : dept.PerforTotal / dept.Number;
 

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)
         {
@@ -136,6 +136,7 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
 
             //取出科室
             var accountList = excel.PerSheet.FirstOrDefault(t => t.SheetType == SheetType.AccountBasic)?.PerData?.Select(t => (PerDataAccountBaisc)t);
+            var accountExtraData = excel.PerSheet.FirstOrDefault(t => t.SheetType == SheetType.AccountExtra)?.PerData?.Select(t => (PerData)t);
 
             List<res_specialunit> resDataList = new List<res_specialunit>();
 
@@ -173,6 +174,9 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
                     //var materialsExtra = materialsExtras?.FirstOrDefault(w => w.UnitType == UnitType.特殊核算组.ToString() && w.AccountingUnit == dept?.AccountingUnit)?.TotelValue;
                     //var scoreAverage = accountScoreAverages?.FirstOrDefault(w => w.UnitType == UnitType.特殊核算组.ToString() && w.AccountingUnit == dept?.AccountingUnit)?.TotelValue;
 
+                    // 夜班绩效 从医院奖罚的明细项中获取
+                    var nightShift = accountExtraData.FirstOrDefault(w => w.UnitType == dept.UnitType && w.AccountingUnit == dept.AccountingUnit && w.TypeName?.Trim() == "夜班绩效")?.CellValue ?? 0;
+
                     decimal? headcount = null;
                     if (typeList.Any(o => o.Description == item.QuantitativeIndicators))
                         headcount = group.Number;
@@ -207,6 +211,7 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
                         AssessBeforeOtherFee = dept?.AssessBeforeOtherFee ?? 0,
                         AssessLaterOtherFee = dept?.AssessLaterOtherFee ?? 0,
                         AdjustLaterOtherFee = dept?.AdjustLaterOtherFee ?? 0,
+                        NightShiftWorkPerforFee = nightShift,
                     };
                     res.PerforTotal = (sumValue ?? 0) + res.AssessBeforeOtherFee;
                     res.GiveFee = Math.Round(res.PerforTotal + res.AssessLaterOtherFee ?? 0);
@@ -541,6 +546,7 @@ public void GenerateSecondAllot(per_allot allot)
                             Month = allot.Month,
                             UnitType = ((UnitType)item.UnitType).ToString(),
                             Department = item.AccountingUnit,
+                            NightShiftWorkPerforFee = item.NightShiftWorkPerforFee,
                             RealGiveFee = item.RealGiveFee,
                         });
                     }
@@ -548,7 +554,7 @@ public void GenerateSecondAllot(per_allot allot)
             }
             if (specialList != null)
             {
-                foreach (var item in specialList.Select(w => new { w.AccountingUnit, w.RealGiveFee }).Distinct())
+                foreach (var item in specialList.Select(w => new { w.AccountingUnit, w.NightShiftWorkPerforFee, w.RealGiveFee }).Distinct())
                 {
                     if (!tempSecond.Any(f => f.UnitType == UnitType.特殊核算组.ToString() && f.Department == item.AccountingUnit))
                     {
@@ -559,6 +565,7 @@ public void GenerateSecondAllot(per_allot allot)
                             Month = allot.Month,
                             UnitType = UnitType.特殊核算组.ToString(),
                             Department = item.AccountingUnit,
+                            NightShiftWorkPerforFee = item.NightShiftWorkPerforFee,
                             RealGiveFee = item.RealGiveFee,
                         });
                     }
@@ -580,13 +587,16 @@ public void GenerateSecondAllot(per_allot allot)
                         UnitType = item.UnitType,
                         Department = item.Department,
                         RealGiveFee = item.RealGiveFee,
+                        NightShiftWorkPerforFee = item.NightShiftWorkPerforFee,
                         Status = 1,
                         NursingDeptStatus = 1,
                     });
                 }
                 else
                 {
-                    if (Math.Abs((second.RealGiveFee ?? 0) - (item.RealGiveFee ?? 0)) >= 0.5m && second.Status > 1)
+                    var backResult = Math.Abs((second.RealGiveFee ?? 0) - (item.RealGiveFee ?? 0)) >= 0.5m
+                        || Math.Abs((second.NightShiftWorkPerforFee ?? 0) - (item.NightShiftWorkPerforFee ?? 0)) >= 0.5m;
+                    if (backResult && second.Status > 1)
                     {
                         second.Status = 4;
                         second.Remark = "科室绩效结果发生变更，需要重新提交";

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/ConfigService.cs

@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Performance.Repository.Repository;
 
 namespace Performance.Services
 {
@@ -27,6 +28,7 @@ public class ConfigService : IAutoInjection
         private PerforCofdepttypeRepository perforCofdepttypeRepository;
         private PerforPerapramountRepository perapramountRepository;
         //private PerforCofcmiRepository perforCofcmiRepository;
+        private PerforCofHrpDeptRepository perforCofHrpDeptRepository;
         private PersonService personService;
         private LogManageService logManageService;
         private ILogger<ConfigService> logger;
@@ -43,6 +45,7 @@ public class ConfigService : IAutoInjection
             PerforCofdepttypeRepository perforCofdepttypeRepository,
             PerforPerapramountRepository perapramountRepository,
             //PerforCofcmiRepository perforCofcmiRepository,
+            PerforCofHrpDeptRepository perforCofHrpDeptRepository,
             PersonService personService,
             LogManageService logManageService,
             ILogger<ConfigService> logger)
@@ -59,6 +62,7 @@ public class ConfigService : IAutoInjection
             this.perforCofdepttypeRepository = perforCofdepttypeRepository;
             this.perapramountRepository = perapramountRepository;
             //this.perforCofcmiRepository = perforCofcmiRepository;
+            this.perforCofHrpDeptRepository = perforCofHrpDeptRepository;
             this.personService = personService;
             this.logManageService = logManageService;
             this.logger = logger;
@@ -834,6 +838,95 @@ private void CopyAprData(int prevAllotId, int allotId)
             }
         }
 
+        public HandsonTable GetHrpDeptHands(int HospitalId,int AllotId)
+        {
+            var result = new HandsonTable((int)SheetType.Unidentifiable, HrpDept.Select(t => t.Value).ToArray(), HrpDept.Select(t => new collect_permission
+            {
+                HeadName = t.Value,
+                Visible = 1
+            }).ToList());
+
+            var data = perforCofHrpDeptRepository.GetEntities(t => t.HospitalId == HospitalId && t.AllotId == AllotId);
+            if (data == null)
+                return result;
+
+            List<HandsonRowData> rowDatas = new List<HandsonRowData>();
+            int i = 1;
+            foreach (var item in data)
+            {
+                var json = JsonHelper.Serialize(item);
+                var firstDic = JsonHelper.Deserialize<Dictionary<string, string>>(json);
+
+                var cells = (from conf in HrpDept join fst in firstDic on conf.Key.ToUpper() equals fst.Key.ToUpper() select new HandsonCellData(conf.Value, fst.Value)).ToList();
+                
+                rowDatas.Add(new HandsonRowData(i, cells));
+                i++;
+            }
+            result.SetRowData(rowDatas, rowDatas != null);
+            return result;
+        }
+
+        public void SaveDepttypeHands(int hospitalId, int allotId,SaveCollectData request)
+        {
+            var dicData = CreateDataRow(hospitalId,allotId, request, HrpDept);
+
+            List<cof_hrp_department> depts = new List<cof_hrp_department>();
+            foreach (var item in dicData)
+            {
+                var json = JsonHelper.Serialize(item);
+                var data = JsonHelper.Deserialize<cof_hrp_department>(json);
+                if (!string.IsNullOrEmpty(data.HRPDepartment) && !string.IsNullOrEmpty(data.AccountingUnit))
+                {
+                    data.HospitalId = hospitalId;
+                    data.AllotId = allotId;
+                    depts.Add(data);
+                }
+            }
+
+            perforCofHrpDeptRepository.Execute("delete from cof_hrp_department where HospitalId=@hospitalId and allotid = @allotid"
+                , new {hospitalId, allotId });
+            perforCofHrpDeptRepository.AddRange(depts.ToArray());
+        }
+
+        private List<Dictionary<string, string>> CreateDataRow(int hospitalId, int allotId, SaveCollectData request, Dictionary<string, string> config)
+        {
+            List<Dictionary<string, string>> allData = new List<Dictionary<string, string>>();
+
+            for (int r = 0; r < request.Data.Length; r++)
+            {
+                // 创建固定数据列
+                Dictionary<string, string> baseData = CreateBaseData(request, config, r);
+                baseData.Add(nameof(cof_hrp_department.AllotId), allotId.ToString());
+                baseData.Add(nameof(cof_hrp_department.HospitalId),hospitalId.ToString());
+                allData.Add(baseData);
+
+            }
+            return allData;
+        }
+
+        private Dictionary<string, string> CreateBaseData(SaveCollectData request, Dictionary<string, string> config, int rownumber)
+        {
+            Dictionary<string, string> result = new Dictionary<string, string>();
+            for (int c = 0; c < request.ColHeaders.Length; c++)
+            {
+                var header = request.ColHeaders[c];
+                var first = config.FirstOrDefault(w => w.Value == header);
+                if (!default(KeyValuePair<string, string>).Equals(first)
+                    && !result.ContainsKey(header)
+                    && request.Data[rownumber].Length > c)
+                {
+                    result.Add(first.Key, request.Data[rownumber][c]);
+                }
+            }
+
+            return result;
+        }
+
+        public static Dictionary<string, string> HrpDept { get; } = new Dictionary<string, string>
+        {
+            {nameof(cof_hrp_department.HRPDepartment), "hrp人员科室"},
+            {nameof(cof_hrp_department.AccountingUnit), "核算单元"},
+        };
         ///// <summary>
         ///// CMI值
         ///// </summary>

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;

performance/Performance.Services/Details/SecondAllotDetails.cs

@@ -635,7 +635,7 @@ private void SupplyHeaderByWorkItem(int hospitalId, SecondResponse result, ag_se
         public HandsonTable GetOtherTempData(int userId, int secondId, int isArchive, int employeeSource, out decimal? realAmount)
         {
             string[] workNumbers = new string[] { };
-            var details = GetOtherTempDetails(userId, secondId, isArchive, employeeSource, ref workNumbers);
+            var details = GetOtherTempDetails(userId, secondId, isArchive, employeeSource);
 
             var secondAllot = agsecondallotRepository.GetEntity(t => t.Id == secondId);
 
@@ -689,7 +689,7 @@ public HandsonTable GetOtherTempData(int userId, int secondId, int isArchive, in
             return result;
         }
 
-        public List<ag_othersource> GetOtherTempDetails(int userId, int secondId, int isArchive, int employeeSource, ref string[] workNumbers)
+        public List<ag_othersource> GetOtherTempDetails(int userId, int secondId, int isArchive, int employeeSource)
         {
             var secondAllot = agsecondallotRepository.GetEntity(t => t.Id == secondId);
             if (secondAllot == null) throw new PerformanceException("二次绩效信息无效！");
@@ -780,7 +780,6 @@ public List<ag_othersource> GetOtherTempDetails(int userId, int secondId, int is
                 }
             }
             var originalEmployees = personService.GetPerEmployee(secondAllot.AllotId.Value);
-            workNumbers = originalEmployees?.Select(t => t.PersonnelNumber).Distinct().ToArray();
             SupplementSecondDetail(secondAllot, originalEmployees, result, isSupplementTitlePerformance);
 
             return result;
@@ -864,7 +863,7 @@ private void SupplementSecondDetail(ag_secondallot second, List<per_employee> em
 
                 foreach (var item in groupData)
                 {
-                    if (employees.Any(t => t.PersonnelNumber == item.WorkNumber)
+                    if (employees != null && employees.Any(t => t.PersonnelNumber == item.WorkNumber)
                         && employees.FirstOrDefault(t => t.PersonnelNumber == item.WorkNumber) is per_employee employee
                         && employee.UnitType == second.UnitType)
                     {

performance/Performance.Services/EmployeeService.cs

@@ -21,6 +21,7 @@ public class EmployeeService : IAutoInjection
     {
         private PerforImemployeeRepository perforImemployeeRepository;
         private PerforPersheetRepository perforPersheetRepository;
+        private PerforImdataRepository perforImdataRepository;
         private PerforPerallotRepository perforPerallotRepository;
         private PerforImemployeeclinicRepository perforImemployeeclinicRepository;
         private PerforUserhospitalRepository perforUserhospitalRepository;
@@ -34,6 +35,7 @@ public class EmployeeService : IAutoInjection
 
         public EmployeeService(PerforImemployeeRepository perforImemployeeRepository,
             PerforPersheetRepository perforPersheetRepository,
+            PerforImdataRepository perforImdataRepository,
             PerforPerallotRepository perforPerallotRepository,
             PerforImemployeeclinicRepository perforImemployeeclinicRepository,
             PerforUserhospitalRepository perforUserhospitalRepository,
@@ -47,6 +49,7 @@ public class EmployeeService : IAutoInjection
         {
             this.perforImemployeeRepository = perforImemployeeRepository;
             this.perforPersheetRepository = perforPersheetRepository;
+            this.perforImdataRepository = perforImdataRepository;
             this.perforPerallotRepository = perforPerallotRepository;
             this.perforImemployeeclinicRepository = perforImemployeeclinicRepository;
             this.perforUserhospitalRepository = perforUserhospitalRepository;
@@ -637,5 +640,55 @@ public List<TitleValue> GetPerforTypeDict(int allotId)
                 Value = t
             }).ToList();
         }
+
+        #region 科室考核
+
+        public List<Dictionary<string, string>> GetDeptAssessment(int allotId)
+        {
+            var sheet = perforPersheetRepository.GetEntity(t => t.AllotID == allotId && t.SheetName == "5.4 科室材料考核2");
+            if (sheet == null)
+                return new List<Dictionary<string, string>>();
+
+            var imData = perforImdataRepository.GetEntities(t => t.AllotID == allotId && t.SheetID == sheet.ID);
+            var headers = imData.OrderByDescending(c=>c.IsTotal).Select(t => t.TypeName).Distinct();
+            var dataNum = imData.Select(t => t.RowNumber)?.OrderBy(c => c.Value).Distinct().ToList();
+            if (!dataNum.Any())
+                return new List<Dictionary<string, string>>();
+
+            var rowData = new List<Dictionary<string, string>>();
+            foreach (var num in dataNum)
+            {
+                var dicData = new Dictionary<string, string>();
+                var fisHeader = false;
+                foreach (var header in headers)
+                {
+                    var headData = imData.Find(t => t.RowNumber == num && t.TypeName == header)?.CellValue;
+                    dicData.Add(header, Math.Round((decimal)headData * 100) + "%");
+                    if (!fisHeader)
+                    {
+                        var data = imData?.First(t => t.RowNumber == num);
+                        switch (data.UnitType)
+                        {
+                            case (int)UnitType.医技组:
+                                dicData.Add("核算单元类型", "医技组");
+                                break;
+                            case (int)UnitType.医生组:
+                                dicData.Add("核算单元类型", "医生组");
+                                break;
+                            case (int)UnitType.护理组:
+                                dicData.Add("核算单元类型", "护理组");
+                                break;
+                        }
+                        dicData.Add("核算单元", data.AccountingUnit);
+                        fisHeader = true;
+                    }
+                }
+                rowData.Add(dicData);
+            }
+
+            return rowData;
+        }
+
+        #endregion
     }
 }

performance/Performance.Services/ExtractExcelService/ExtractDtos/SpecialUnitColumns.cs

@@ -17,5 +17,9 @@ public class SpecialUnitColumns
         public const string TargetFactor = "量化指标绩效分值";
 
         public const string AdjustFactor = "调节系数";
+
+        public const string AssessBefore = "考核前绩效";
+
+        public const string Avg = "人均";
     }
 }

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -144,6 +144,7 @@ private void WriteDataToFile(IWorkbook workbook, per_allot allot, Dictionary<ExD
             for (int sheetIndex = 0; sheetIndex < workbook.NumberOfSheets; sheetIndex++)
             {
                 var sheet = workbook.GetSheetAt(sheetIndex);
+                string sheetName = sheet.SheetName.NoBlank();
 
                 ratio += 40m / workbook.NumberOfSheets;
                 var sheetType = perSheetService.GetSheetType(sheet.SheetName);
@@ -156,13 +157,14 @@ private void WriteDataToFile(IWorkbook workbook, per_allot allot, Dictionary<ExD
                 if (sheetType == SheetType.OtherWorkload) point = PerSheetDataFactory.GetDataRead(SheetType.Workload)?.Point;
 
                 if (types.Contains(sheetType) && point != null && point.DataFirstCellNum.HasValue)
+                {
+                    logger.LogInformation($"{sheetName}开始清除历史数据。point：{JsonHelper.Serialize(point)}");
                     ExtractHelper.ClearSheetPartialData(sheet, point, sheetType);
+                }
 
                 var customer = factory.GetWriteData(sheetType, logger);
                 if (customer != null)
                 {
-                    string sheetName = sheet.SheetName.NoBlank();
-
                     var collects = collectData?.Where(t => t.SheetName.NoBlank() == sheetName).ToList();
                     customer.WriteCollectData(sheet, point, sheetType, style, collects, exdict);
 

performance/Performance.Services/ExtractExcelService/SheetDataWrite/SpecialUnitDataWrite.cs

@@ -188,10 +188,13 @@ private void SupplySpecialQuantity(ISheet sheet, ExcelStyle style, List<SpecialD
                     if (special != null)
                     {
                         var cell = row.GetOrCreate(quantityIndex);
+
+                        if (cell.CellType != CellType.Formula)
+                        {
                             cell.SetCellType(CellType.Numeric);
                             cell.SetCellValue<double>(special.Quantity);
                             cell.CellStyle = cellStyle;
-
+                        }
                         specials.Remove(special);
                     }
                     dataFirstRowNum = rowIndex + 1;
@@ -320,7 +323,14 @@ private void AddMergedRegion(ISheet sheet, List<SpecialCellRange> ranges, List<s
             if (columns == null || !columns.Any()) return;
             if (ranges == null || !ranges.Any()) return;
 
-            var columnIndexs = new string[] { SpecialUnitColumns.Department, SpecialUnitColumns.PeopleNumber, SpecialUnitColumns.AdjustFactor }.Select(t => columns.IndexOf(t));
+            var columnIndexs = new string[]
+            {
+                SpecialUnitColumns.Department,
+                SpecialUnitColumns.PeopleNumber,
+                SpecialUnitColumns.AdjustFactor,
+                SpecialUnitColumns.AssessBefore,
+                SpecialUnitColumns.Avg
+            }.Select(t => columns.IndexOf(t));
             if (columnIndexs == null || !columnIndexs.Any(t => t > -1)) return;
 
             foreach (var index in columnIndexs.Where(t => t > -1))