Merge branch 'feature/划拨' into release/v20210709功能分支合并

# Conflicts:
#	performance/Performance.Api/wwwroot/Performance.DtoModels.xml
#	performance/Performance.Api/wwwroot/Performance.EntityModels.xml
#	performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs
#	performance/Performance.EntityModels/Context/PerformanceDbContext.cs
#	performance/Performance.EntityModels/Entity/cof_alias.cs
#	performance/Performance.EntityModels/Entity/per_employee.cs
#	performance/Performance.EntityModels/Entity/res_compute.cs

performance/Performance.Api/Controllers/AllotController.cs

@@ -34,6 +34,7 @@ public class AllotController : Controller
         private ILogger<AllotController> _logger;
         private ClaimService _claim;
         private LogManageService _logManageService;
+        private readonly CostTransferService costTransferService;
         private IBackgroundTaskQueue _backgroundTaskQueue;
         private IServiceScopeFactory _serviceScopeFactory;
 
@@ -45,7 +46,8 @@ public class AllotController : Controller
             IBackgroundTaskQueue backgroundTaskQueue,
             IServiceScopeFactory serviceScopeFactory,
             ClaimService claim,
-            LogManageService logManageService)
+            LogManageService logManageService,
+            CostTransferService costTransferService)
         {
             _allotService = allotService;
             _resultComputeService = resultComputeService;
@@ -53,6 +55,7 @@ public class AllotController : Controller
             _evn = evn;
             _claim = claim;
             _logManageService = logManageService;
+            this.costTransferService = costTransferService;
             _configService = configService;
             _backgroundTaskQueue = backgroundTaskQueue;
             _serviceScopeFactory = serviceScopeFactory;
@@ -96,6 +99,8 @@ public ApiResponse Insert([FromBody] AllotRequest request)
             var userId = _claim.GetUserId();
             var result = _allotService.InsertAllot(request, userId);
             _configService.Copy(result);
+            //带出上月划拨记录
+            costTransferService.IntoLastTiemData(request.HospitalId.Value, result.ID);
             return new ApiResponse(ResponseType.OK, result);
         }
 
@@ -421,6 +426,8 @@ public ApiResponse Issued([FromBody] AllotRequest request)
             _allotService.UpdateAllotStates(allot.ID, (int)AllotStates.GenerateSucceed, EnumHelper.GetDescription(AllotStates.GenerateSucceed));
             // 科室下发
             _resultComputeService.GenerateSecondAllot(allot);
+            //绩效划拨，下发驳回
+            costTransferService.RejectedApplicat(allot.ID);
             return new ApiResponse(ResponseType.OK);
         }
 

performance/Performance.Api/Controllers/CostTransferController.cs

+using Microsoft.AspNetCore.Mvc;
+using Performance.DtoModels;
+using Performance.EntityModels;
+using Performance.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Performance.Api.Controllers
+{
+    [Route("api/[controller]")]
+    public class CostTransferController : Controller
+    {
+        private readonly CostTransferService costTransferService;
+        private readonly ClaimService claim;
+        private readonly RoleService roleService;
+        private readonly UserService userService;
+
+        public CostTransferController(
+            CostTransferService costTransferService,
+            ClaimService claim,
+            RoleService roleService,
+            UserService userService)
+
+        {
+            this.costTransferService = costTransferService;
+            this.claim = claim;
+            this.roleService = roleService;
+            this.userService = userService;
+        }
+        /// <summary>
+        /// 申请划拨
+        /// </summary>
+        /// <returns></returns>
+        [Route("submit")]
+        [HttpPost]
+        public ApiResponse SubmitApplications([FromBody] CostTransferRequest request)
+        {
+            if (request.AllotId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
+
+            var result = costTransferService.Applicat(request);
+            return new ApiResponse(ResponseType.OK, result);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        [Route("common/{hospitalId}/allot/{allotId}")]
+        [HttpPost]
+        public ApiResponse Common(int hospitalId, int allotId, [FromBody] DepartmentDetail detail)
+        {
+            if (hospitalId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数HospitalId无效！");
+            if (allotId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
+
+            var userid = claim.GetUserId();
+            var user = userService.GetUser(userid);
+            var role = roleService.GetARole(user.UserID);
+
+            var result = costTransferService.Common(allotId, hospitalId, role.Type.Value, user.Department, detail);
+
+            result.deparment = user.Department ?? "";
+            return new ApiResponse(ResponseType.OK, result);
+        }
+
+        /// <summary>
+        /// 当前科室、类别
+        /// </summary>
+        /// <returns></returns>
+        [Route("deptdetial/{hospitalId}/allot/{allotId}")]
+        [HttpPost]
+        public ApiResponse DeptDetial(int hospitalId, int allotId)
+        {
+            if (hospitalId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数HospitalId无效！");
+            if (allotId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
+
+            var userid = claim.GetUserId();
+            var user = userService.GetUser(userid);
+            var role = roleService.GetARole(user.UserID);
+
+            var result = costTransferService.DeptDetial(allotId, hospitalId, role.Type.Value, user.Department);
+
+            result.Item2.Department = user.Department ?? "";
+            return new ApiResponse(ResponseType.OK, result.Item2);
+        }
+
+        /// <summary>
+        /// 撤回提交
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
+        [Route("withdrawsubmit/{itemId}")]
+        [HttpPost]
+        public ApiResponse WithdrawSubmit(int itemId)
+        {
+            if (itemId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数itemId无效!");
+
+            costTransferService.WithdrawSubmit(itemId);
+            return new ApiResponse(ResponseType.OK);
+        }
+
+        /// <summary>
+        /// 审核列表
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <param name="menuType"></param>
+        /// <returns></returns>
+        [Route("auditlist/{allotId}/menuType/{menuType}")]
+        [HttpPost]
+        public ApiResponse AuditList(int allotId, int menuType)
+        {
+            if (allotId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
+
+            var userid = claim.GetUserId();
+            var user = userService.GetUser(userid);
+            var role = roleService.GetARole(user.UserID);
+            var result = costTransferService.GetAuditList(allotId, menuType, role.Type.Value, user.Department);
+
+            return new ApiResponse(ResponseType.OK, result);
+
+        }
+
+        /// <summary>
+        /// 划拨审核
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("costtransferaudit")]
+        [HttpPost]
+        public ApiResponse Audit([FromBody] AuditRequest request)
+        {
+            if (request.AllotId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
+
+            var userid = claim.GetUserId();
+            var user = userService.GetUser(userid);
+            var role = roleService.GetARole(user.UserID);
+            var roleArr = new[] { 1, 2, 5 };
+
+            if (roleArr.Contains(role.Type.Value))
+                costTransferService.CostTransferAudit(request, true);
+            else
+                costTransferService.CostTransferAudit(request, false);
+            return new ApiResponse(ResponseType.OK);
+        }
+
+        /// <summary>
+        /// 驳回修改
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("updateapplicat")]
+        [HttpPost]
+        public ApiResponse UpdateApplicat([FromBody] CostTransferUpdateRequest request)
+        {
+            if (request.AllotId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
+
+            costTransferService.UpdateApplicat(request);
+            return new ApiResponse(ResponseType.OK);
+        }
+
+        /// <summary>
+        /// 划拨报表
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <param name="auditType"></param>
+        /// <param name="detail"></param>
+        /// <returns></returns>
+        [Route("transfercontent/{allotId}/auditType/{auditType}")]
+        [HttpPost]
+        public ApiResponse TransferContent(int allotId,int auditType ,[FromBody] DepartmentDetail detail)
+        {
+            if (allotId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
+
+            var result=costTransferService.TransferContent(allotId,auditType,detail);
+
+            return new ApiResponse(ResponseType.OK,result);
+        }
+    }
+}

performance/Performance.Api/Properties/PublishProfiles/FolderProfile.pubxml

@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>bin\Release\netcoreapp2.2\publish\</PublishUrl>
+    <PublishUrl>D:\publish\jx.suvalue.com2</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <SiteUrlToLaunchAfterPublish />
     <TargetFramework>netcoreapp2.2</TargetFramework>

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

@@ -742,6 +742,62 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.CostTransferController.SubmitApplications(Performance.DtoModels.CostTransferRequest)">
+            <summary>
+            申请划拨
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.CostTransferController.Common(System.Int32,System.Int32,Performance.DtoModels.DepartmentDetail)">
+            <summary>
+            
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.CostTransferController.DeptDetial(System.Int32,System.Int32)">
+            <summary>
+            当前科室、类别
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.CostTransferController.WithdrawSubmit(System.Int32)">
+            <summary>
+            撤回提交
+            </summary>
+            <param name="itemId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.CostTransferController.AuditList(System.Int32,System.Int32)">
+            <summary>
+            审核列表
+            </summary>
+            <param name="allotId"></param>
+            <param name="menuType"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.CostTransferController.Audit(Performance.DtoModels.AuditRequest)">
+            <summary>
+            划拨审核
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.CostTransferController.UpdateApplicat(Performance.DtoModels.CostTransferUpdateRequest)">
+            <summary>
+            驳回修改
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.CostTransferController.TransferContent(System.Int32,System.Int32,Performance.DtoModels.DepartmentDetail)">
+            <summary>
+            划拨报表
+            </summary>
+            <param name="allotId"></param>
+            <param name="auditType"></param>
+            <param name="detail"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetEmployeeList(Performance.DtoModels.EmployeeRequest)">
             <summary>
             获取人员列表

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

@@ -158,7 +158,7 @@
             <summary> 归档 </summary>
         </member>
         <member name="F:Performance.DtoModels.AllotStates.Wait">
-            <summary> 归档 </summary>
+            <summary> 等待 </summary>
         </member>
         <member name="F:Performance.DtoModels.AllotStates.GenerateAccomplish">
             <summary> 绩效结果解析成功 </summary>
@@ -2977,6 +2977,36 @@
             职称
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.CostTransferResponse.AllotId">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.CostTransferResponse.ApplicantUnitType">
+            <summary>
+            申请者核算单元类型
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.CostTransferResponse.ApplicantDepartment">
+            <summary>
+            申请者科室
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.CostTransferResponse.AdoptedUnitType">
+            <summary>
+            审核者核算单元类型
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.CostTransferResponse.AdoptedDepartment">
+            <summary>
+            审核者科室
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.CostTransferResponse.Status">
+            <summary>
+            0 未审核 1 部分审核 2 全部审核 
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.DeptDataDetails`1.Pandect">
             <summary> 概览</summary>
         </member>

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

@@ -236,6 +236,11 @@ public AutoMapperConfigs()
                .ForMember(dest => dest.PersonTime, opt => opt.MapFrom(src => src.ResultData))
                .ReverseMap();
 
+            CreateMap<cost_transfer, CostTransferResponse>(
+                ).ForMember(back => back.Items, n => n.Ignore());
+            CreateMap<cost_transfer, cost_transfer>(
+                ).ForMember(back => back.Id, n => n.Ignore());
+
             CreateMap<ag_headsource, SecPrintHeaderResponse>().ReverseMap();
         }
     }

performance/Performance.DtoModels/Enum.cs

@@ -74,7 +74,7 @@ public enum AllotStates
         /// <summary> 归档 </summary>
         [Description("归档")]
         Archive = 8,
-        /// <summary> 归档 </summary>
+        /// <summary> 等待 </summary>
         [Description("等待")]
         Wait = 9,
         /// <summary> 绩效结果解析成功 </summary>

performance/Performance.DtoModels/Request/CostTransferItemRequest.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Performance.DtoModels
+{
+    public class CostTransferItemRequest
+    {
+        public string Category { get; set; }
+
+        public string Source { get; set; }
+
+        public decimal? Ratio { get; set; }
+
+        public decimal? Amount { get; set; }
+
+        public decimal? CalculationAmount { get; set; }
+
+        public int IsUseRatio { get; set; }
+
+        public string ApplicationRemark { get; set; }
+    }
+}

performance/Performance.DtoModels/Request/CostTransferRequest.cs

+using Performance.EntityModels;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Performance.DtoModels
+{
+    public class CostTransferRequest
+    {
+        public int AllotId { get; set; }
+
+        public DepartmentDetail Applicant { get; set; }
+
+        public DepartmentDetail Adopted { get; set; }
+
+        public List<CostTransferItemRequest> Items { get; set; }
+    }
+
+    public class DepartmentDetail
+    {
+        public string UnitType { get; set; }
+
+        public string Department { get; set; }
+    }
+
+    public class CostTransferUpdateRequest : CostTransferRequest
+    {
+        public int TransferId { get; set; }
+
+        
+
+        public new List<cost_transfer_item> Items { get; set; }
+    }
+
+    public class AuditRequest
+    {
+        public int AllotId { get; set; }
+        public int[] TransferItemId { get; set; }
+
+        public int Status { get; set; }
+
+        public string Remake { get; set; }
+    }
+}

performance/Performance.DtoModels/Response/CostTransferResponse.cs

+using Performance.EntityModels;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Performance.DtoModels
+{
+    public class CostTransferResponse
+    {
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int AllotId { get; set; }
+
+        /// <summary>
+        /// 申请者核算单元类型
+        /// </summary>
+        public string ApplicantUnitType { get; set; }
+
+        /// <summary>
+        /// 申请者科室
+        /// </summary>
+        public string ApplicantDepartment { get; set; }
+
+        /// <summary>
+        /// 审核者核算单元类型
+        /// </summary>
+        public string AdoptedUnitType { get; set; }
+
+        /// <summary>
+        /// 审核者科室
+        /// </summary>
+        public string AdoptedDepartment { get; set; }
+
+        /// <summary>
+        /// 0 未审核 1 部分审核 2 全部审核 
+        /// </summary>
+        public int Status { get; set; }
+
+        public int AdminStatus { get; set; }
+
+        public decimal AmountSum { get; set; }
+
+        public List<Option> Items { get; set; }
+    }
+
+
+    public class CommonResponse
+    {
+        public string deparment { get; set; }
+        public string unitType { get; set; }
+        public List<TitleValue> account { get; set; }
+
+        public List<Common> Data { get; set; }
+    }
+
+    public class Common
+    {
+        public string Source { get; set; }
+        public string Category { get; set; }
+        public decimal Ratio { get; set; }
+    }
+
+    public class Option : cost_transfer_item
+    {
+        public string[] options { get; set; }
+        public string ApplicantDepartment { get; set; }
+        public string AdoptedDepartment { get; set; }
+    }
+
+}

performance/Performance.DtoModels/Response/TransferReportResponse.cs

+using Performance.EntityModels;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Performance.DtoModels
+{
+    public class TransferReportResponse
+    {
+        public List<Transfer> Transfers { get; set; }
+
+        public List<TransferItem> Items { get; set; }
+    }
+
+    public class Transfer
+    {
+        public string ApplicantUnitType { get; set; }
+
+        public string ApplicantDepartment { get; set; }
+
+        public decimal? AmountSum { get; set; }
+
+        public string AdoptedUnitType { get; set; }
+
+        public string AdoptedDepartment { get; set; }
+
+        public decimal? PassAmountSum { get; set; }
+    }
+
+    public class TransferItem : cost_transfer_item
+    {
+        public string ApplicantUnitType { get; set; }
+
+        public string ApplicantDepartment { get; set; }
+
+        public string AdoptedUnitType { get; set; }
+
+        public string AdoptedDepartment { get; set; }
+    }
+}

performance/Performance.EntityModels/Context/PerformanceDbContext.cs

-
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using System;
@@ -94,11 +93,14 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
         public virtual DbSet<cof_workloadtype> cof_workloadtype { get; set; }
         /// <summary> 工龄对应绩效系数配置 </summary>
         public virtual DbSet<cof_workyear> cof_workyear { get; set; }
-
         /// <summary>  </summary>
         public virtual DbSet<collect_data> collect_data { get; set; }
         /// <summary>  </summary>
         public virtual DbSet<collect_permission> collect_permission { get; set; }
+        /// <summary>  </summary>
+        public virtual DbSet<cost_transfer> cost_transfer { get; set; }
+        /// <summary>  </summary>
+        public virtual DbSet<cost_transfer_item> cost_transfer_item { get; set; }
         /// <summary> 自定义导出 </summary>
         public virtual DbSet<cust_script> cust_script { get; set; }
         /// <summary>  </summary>

performance/Performance.EntityModels/Entity/Sys_User.cs

@@ -7,70 +7,70 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("sys_user")]
-	public class sys_user
+    public class sys_user
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 创建时间
         /// </summary>
         public Nullable<DateTime> CreateDate { get; set; }
-    
+
         /// <summary>
         /// 创建人
         /// </summary>
         public Nullable<int> CreateUser { get; set; }
-    
+
         /// <summary>
         /// 真实名称
         /// </summary>
         public string RealName { get; set; }
-    
+
         /// <summary>
         /// 手机号
         /// </summary>
         public string Mobile { get; set; }
-    
+
         /// <summary>
         /// 登录名称
         /// </summary>
         public string Login { get; set; }
-    
+
         /// <summary>
         /// 密码
         /// </summary>
         public string Password { get; set; }
-    
+
         /// <summary>
         /// 邮箱
         /// </summary>
         public string Mail { get; set; }
-    
+
         /// <summary>
         /// 用户状态 1启用 2禁用
         /// </summary>
         public Nullable<int> States { get; set; }
-    
+
         /// <summary>
         /// 用户科室
         /// </summary>
         public string Department { get; set; }
-    
+
         /// <summary>
         /// 删除状态 1可用 2删除
         /// </summary>
         public Nullable<int> IsDelete { get; set; }
-    
+
         /// <summary>
         /// 父级ID
         /// </summary>

performance/Performance.EntityModels/Entity/ag_againsituation.cs

@@ -7,80 +7,80 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 二次分配概览
     /// </summary>
     [Table("ag_againsituation")]
-	public class ag_againsituation
+    public class ag_againsituation
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AgainAllotID { get; set; }
-    
+
         /// <summary>
         /// 夜班费
         /// </summary>
         public Nullable<decimal> NightShift { get; set; }
-    
+
         /// <summary>
         /// 科室总绩效
         /// </summary>
         public Nullable<decimal> DepartmentTotal { get; set; }
-    
+
         /// <summary>
         /// 护士长或科主任基础绩效
         /// </summary>
         public Nullable<decimal> BossPerfor { get; set; }
-    
+
         /// <summary>
         /// 重点奖励
         /// </summary>
         public Nullable<decimal> Award { get; set; }
-    
+
         /// <summary>
         /// 管理津贴
         /// </summary>
         public Nullable<decimal> Allowance { get; set; }
-    
+
         /// <summary>
         /// 业绩分配绩效
         /// </summary>
         public Nullable<decimal> AllotPerfor { get; set; }
-    
+
         /// <summary>
         /// 职称绩效
         /// </summary>
         public Nullable<decimal> JobPerfor { get; set; }
-    
+
         /// <summary>
         /// 工作量绩效
         /// </summary>
         public Nullable<decimal> WorkloadPerfor { get; set; }
-    
+
         /// <summary>
         /// 单独核算人员绩效
         /// </summary>
         public decimal AlonePerfor { get; set; }
-    
+
         /// <summary>
         /// 出勤
         /// </summary>
         public Nullable<decimal> Attendance { get; set; }
-    
+
         /// <summary>
         /// 科室系数人均
         /// </summary>

performance/Performance.EntityModels/Entity/ag_bodysource.cs

@@ -7,13 +7,13 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 二次绩效保存数据
     /// </summary>
     [Table("ag_bodysource")]
-	public class ag_bodysource
+    public class ag_bodysource
     {
         /// <summary>
         /// 

performance/Performance.EntityModels/Entity/ag_compute.cs

@@ -7,75 +7,75 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 二次绩效结果表
     /// </summary>
     [Table("ag_compute")]
-	public class ag_compute
+    public class ag_compute
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 绩效ID
         /// </summary>
         public Nullable<int> AllotId { get; set; }
-    
+
         /// <summary>
         /// 二次绩效ID
         /// </summary>
         public Nullable<int> SecondId { get; set; }
-    
+
         /// <summary>
         /// 科室类型
         /// </summary>
         public string UnitType { get; set; }
-    
+
         /// <summary>
         /// 科室
         /// </summary>
         public string Department { get; set; }
-    
+
         /// <summary>
         /// 职称
         /// </summary>
         public string WorkPost { get; set; }
-    
+
         /// <summary>
         /// 工号
         /// </summary>
         public string JobNumber { get; set; }
-    
+
         /// <summary>
         /// 人员名称
         /// </summary>
         public string PersonName { get; set; }
-    
+
         /// <summary>
         /// 可分配绩效
         /// </summary>
         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; }
-    
+
         /// <summary>
         /// 实发金额
         /// </summary>

performance/Performance.EntityModels/Entity/ag_data.cs

@@ -7,70 +7,70 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 二次分配不固定数据
     /// </summary>
     [Table("ag_data")]
-	public class ag_data
+    public class ag_data
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AgainAllotID { get; set; }
-    
+
         /// <summary>
         /// 行号
         /// </summary>
         public Nullable<int> RowNumber { get; set; }
-    
+
         /// <summary>
         /// 列头类型名称
         /// </summary>
         public string TypeName { get; set; }
-    
+
         /// <summary>
         /// 单元格value
         /// </summary>
         public Nullable<decimal> CellValue { get; set; }
-    
+
         /// <summary>
         /// 1 汇总  2原始数据
         /// </summary>
         public Nullable<int> IsTotal { get; set; }
-    
+
         /// <summary>
         /// 是否带入系数计算 1 带入 2 不带入
         /// </summary>
         public Nullable<int> IsFactor { get; set; }
-    
+
         /// <summary>
         /// 系数值
         /// </summary>
         public Nullable<decimal> FactorValue { get; set; }
-    
+
         /// <summary>
         /// 单元格注释
         /// </summary>
         public string Annotation { get; set; }
-    
+
         /// <summary>
         /// 单元格备注
         /// </summary>
         public string Remark { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>

performance/Performance.EntityModels/Entity/ag_employee.cs

@@ -7,100 +7,100 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 二次分配人员名单
     /// </summary>
     [Table("ag_employee")]
-	public class ag_employee
+    public class ag_employee
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AgainAllotID { get; set; }
-    
+
         /// <summary>
         /// 行号
         /// </summary>
         public Nullable<int> RowNumber { get; set; }
-    
+
         /// <summary>
         /// 姓名
         /// </summary>
         public string Name { get; set; }
-    
+
         /// <summary>
         /// 职务
         /// </summary>
         public string JobTitle { get; set; }
-    
+
         /// <summary>
         /// 职称系数
         /// </summary>
         public Nullable<decimal> JobFactor { get; set; }
-    
+
         /// <summary>
         /// 出勤
         /// </summary>
         public Nullable<decimal> Attendance { get; set; }
-    
+
         /// <summary>
         /// 年资
         /// </summary>
         public Nullable<decimal> YearFactor { get; set; }
-    
+
         /// <summary>
         /// 重点奖励
         /// </summary>
         public Nullable<decimal> Award { get; set; }
-    
+
         /// <summary>
         /// 管理津贴
         /// </summary>
         public Nullable<decimal> Allowance { get; set; }
-    
+
         /// <summary>
         /// 单独核算人员绩效
         /// </summary>
         public Nullable<decimal> AlonePerfor { get; set; }
-    
+
         /// <summary>
         /// 夜班费
         /// </summary>
         public Nullable<decimal> NightShift { get; set; }
-    
+
         /// <summary>
         /// 职称出勤系数(需计算)
         /// </summary>
         public Nullable<decimal> JobAttendanceFactor { get; set; }
-    
+
         /// <summary>
         /// 年资出勤系数(需计算)
         /// </summary>
         public Nullable<decimal> YearAttendanceFactor { get; set; }
-    
+
         /// <summary>
         /// 职称出勤绩效(需计算)
         /// </summary>
         public Nullable<decimal> JobAttendancePerfor { get; set; }
-    
+
         /// <summary>
         /// 应发绩效(需计算)
         /// </summary>
         public Nullable<decimal> GiveFee { get; set; }
-    
+
         /// <summary>
         /// 实发绩效(需计算)
         /// </summary>

performance/Performance.EntityModels/Entity/ag_fixatitem.cs

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

performance/Performance.EntityModels/Entity/ag_header.cs

@@ -7,70 +7,70 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 二次分配不固定列头数据
     /// </summary>
     [Table("ag_header")]
-	public class ag_header
+    public class ag_header
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AgainAllotID { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> ParentID { get; set; }
-    
+
         /// <summary>
         /// 行坐标
         /// </summary>
         public Nullable<int> PointRow { get; set; }
-    
+
         /// <summary>
         /// 列坐标
         /// </summary>
         public Nullable<int> PointCell { get; set; }
-    
+
         /// <summary>
         /// 是否合并 1 合并 2 不合并
         /// </summary>
         public Nullable<int> IsMerge { get; set; }
-    
+
         /// <summary>
         /// 合并行
         /// </summary>
         public Nullable<int> MergeRow { get; set; }
-    
+
         /// <summary>
         /// 合并列
         /// </summary>
         public Nullable<int> MergeCell { get; set; }
-    
+
         /// <summary>
         /// 单元格内容
         /// </summary>
         public string CellValue { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public string SignID { get; set; }
-    
+
         /// <summary>
         /// 1 汇总  2原始数据
         /// </summary>

performance/Performance.EntityModels/Entity/ag_headsource.cs

@@ -29,7 +29,7 @@ public class ag_headsource
         /// <summary>
         /// 可分配绩效
         /// </summary>
-        public Nullable<decimal> TotalPerformance { get; set; }
+        public decimal TotalPerformance { get; set; }
 
         /// <summary>
         /// 医院其他绩效

performance/Performance.EntityModels/Entity/ag_itemvalue.cs

@@ -7,35 +7,35 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 科室二次绩效录入内容
     /// </summary>
     [Table("ag_itemvalue")]
-	public class ag_itemvalue
+    public class ag_itemvalue
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 绩效Id
         /// </summary>
         public Nullable<int> AllotId { get; set; }
-    
+
         /// <summary>
         /// 二次绩效ID
         /// </summary>
         public Nullable<int> SecondId { get; set; }
-    
+
         /// <summary>
         /// 绩效项来源 1 模板 2 工作量
         /// </summary>
         public Nullable<int> SourceType { get; set; }
-    
+
         /// <summary>
         /// 值
         /// </summary>

performance/Performance.EntityModels/Entity/ag_othersource.cs

@@ -7,100 +7,100 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 二次绩效其他绩效来源
     /// </summary>
     [Table("ag_othersource")]
-	public class ag_othersource
+    public class ag_othersource
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> SecondId { get; set; }
-    
+
         /// <summary>
         /// 工号
         /// </summary>
         public string WorkNumber { get; set; }
-    
+
         /// <summary>
         /// 姓名
         /// </summary>
         public string Name { get; set; }
-    
+
         /// <summary>
         /// 科室
         /// </summary>
         public string Department { get; set; }
-    
+
         /// <summary>
         /// 职称
         /// </summary>
         public string WorkPost { get; set; }
-    
+
         /// <summary>
         /// 职称绩效
         /// </summary>
         public Nullable<decimal> TitlePerformance { get; set; }
-    
+
         /// <summary>
         /// 工作量绩效工资
         /// </summary>
         public Nullable<decimal> WorkPerformance { get; set; }
-    
+
         /// <summary>
         /// 科室单项奖励(只读)
         /// </summary>
         public Nullable<decimal> DeptReward { get; set; }
-    
+
         /// <summary>
         /// 可分配绩效
         /// </summary>
         public Nullable<decimal> DistPerformance { get; set; }
-    
+
         /// <summary>
         /// 医院其他绩效
         /// </summary>
         public Nullable<decimal> OtherPerformance { get; set; }
-    
+
         /// <summary>
         /// 夜班工作量绩效
         /// </summary>
         public Nullable<decimal> NightWorkPerformance { get; set; }
-    
+
         /// <summary>
         /// 实发绩效工资金额
         /// </summary>
         public Nullable<decimal> RealAmount { get; set; }
-    
+
         /// <summary>
         /// 预留比例
         /// </summary>
         public Nullable<decimal> ReservedRatio { get; set; }
-    
+
         /// <summary>
         /// 预留金额
         /// </summary>
         public Nullable<decimal> ReservedAmount { get; set; }
-    
+
         /// <summary>
         /// 管理津贴
         /// </summary>
         public Nullable<decimal> ManagementAllowance { get; set; }
-    
+
         /// <summary>
         /// 单项奖励
         /// </summary>
         public Nullable<decimal> IndividualReward { get; set; }
-    
+
         /// <summary>
         /// 重点专科分配
         /// </summary>

performance/Performance.EntityModels/Entity/ag_secondallot.cs

@@ -7,127 +7,128 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 二次绩效列表
     /// </summary>
     [Table("ag_secondallot")]
-	public class ag_secondallot
+    public class ag_secondallot
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 绩效ID
         /// </summary>
         public Nullable<int> AllotId { get; set; }
-    
+
         /// <summary>
         /// 使用模板
         /// </summary>
         public Nullable<int> UseTempId { get; set; }
-    
+
         /// <summary>
         /// 科室类型
         /// </summary>
         public string UnitType { get; set; }
-    
+
         /// <summary>
         /// 年
         /// </summary>
         public Nullable<int> Year { get; set; }
-    
+
         /// <summary>
         /// 月
         /// </summary>
         public Nullable<int> Month { get; set; }
-    
+
         /// <summary>
         /// 科室
         /// </summary>
         public string Department { get; set; }
-    
+
         /// <summary>
         /// 科室实发金额
         /// </summary>
         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; }
-    
+
         /// <summary>
-        /// 提交类型 1 使用模板 2 其他类型数据
+        /// 提交类型 1使用模板 2 其他类型数据
         /// </summary>
         public Nullable<int> SubmitType { get; set; }
-    
+
         /// <summary>
         /// 提交时间
         /// </summary>
         public Nullable<DateTime> SubmitTime { get; set; }
-    
+
         /// <summary>
         /// 审核时间
         /// </summary>
         public Nullable<DateTime> AuditTime { get; set; }
-    
+
         /// <summary>
         /// 审核人
         /// </summary>
         public Nullable<int> AuditUser { get; set; }
-    
+
         /// <summary>
         /// 备注
         /// </summary>
         public string Remark { get; set; }
-    
+
         /// <summary>
         /// 护理部审核时间
         /// </summary>
         public Nullable<DateTime> NursingDeptAuditTime { get; set; }
-    
+
         /// <summary>
         /// 护理部审核人
         /// </summary>
         public Nullable<int> NursingDeptAuditUser { get; set; }
-    
+
         /// <summary>
         /// 护理部备注
         /// </summary>
         public string NursingDeptRemark { get; set; }
-    
+
         /// <summary>
         /// 护理部审核状态 2 等待审核 3 审核通过 4 驳回
         /// </summary>
         public Nullable<int> NursingDeptStatus { get; set; }
+
         /// <summary>
         /// 夜班绩效
         /// </summary>
-        public decimal? NightShiftWorkPerforFee { get; set; }
+        public Nullable<decimal> NightShiftWorkPerforFee { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/ag_temp.cs

@@ -3,34 +3,33 @@
 // * FileName: 二次绩效模板.cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 二次绩效模板
     /// </summary>
     [Table("ag_temp")]
-	public class ag_temp
+    public class ag_temp
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 模板名称
         /// </summary>
         public string TempName { get; set; }
-    
+
         /// <summary>
         /// 类型
         /// </summary>
         public string UnitType { get; set; }
-    
+
         /// <summary>
         /// 是否可用 1 可用 2 不可用
         /// </summary>

performance/Performance.EntityModels/Entity/ag_tempitem.cs

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

performance/Performance.EntityModels/Entity/ag_usetemp.cs

@@ -7,35 +7,35 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("ag_usetemp")]
-	public class ag_usetemp
+    public class ag_usetemp
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> HospitalId { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public string Department { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public string UnitType { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>

performance/Performance.EntityModels/Entity/ag_workload.cs

@@ -7,57 +7,57 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 二次绩效工作量绩效
     /// </summary>
     [Table("ag_workload")]
-	public class ag_workload
+    public class ag_workload
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 医院ID
         /// </summary>
         public Nullable<int> HospitalId { get; set; }
-    
+
         /// <summary>
         /// 科室
         /// </summary>
         public string Department { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public string UnitType { get; set; }
-    
+
         /// <summary>
         /// 工作量考核项ID
         /// </summary>
         public string ItemId { get; set; }
-    
+
         /// <summary>
         /// 工作量名称
         /// </summary>
         public string ItemName { get; set; }
-    
+
         /// <summary>
         /// 工作量系数
         /// </summary>
         public Nullable<decimal> FactorValue { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<decimal> Sort { get; set; }
-    
+
         /// <summary>
-        /// 1、单项奖励 2、工作量占比 ..（自定义占比）
+        /// -1、单项奖励 0、工作量占比 ..（自定义占比）
         /// </summary>
         public int WorkTypeId { get; set; }
     }

performance/Performance.EntityModels/Entity/ag_workload_source.cs

-//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
 // <copyright file=" ag_workload_source.cs">
 // * FileName: .cs 
 // </copyright>
@@ -57,7 +57,7 @@ public class ag_workload_source
         public Nullable<decimal> Value { get; set; }
 
         /// <summary>
-        /// 1、单项奖励 2、工作量占比 ..（自定义占比）
+        /// -1、单项奖励 0、工作量占比 ..（自定义占比）
         /// </summary>
         public Nullable<int> WorkTypeId { get; set; }
     }

performance/Performance.EntityModels/Entity/ag_workload_type.cs

 //-----------------------------------------------------------------------
 // <copyright file=" ag_workload_type.cs">
-// * FileName: .cs 
+// * FileName: 二次绩效工作量绩效分类.cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
-    /// 
+    /// 二次绩效工作量绩效分类
     /// </summary>
     [Table("ag_workload_type")]
-	public class ag_workload_type
+    public class ag_workload_type
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public int HospitalId { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public string TypeName { get; set; }
-    
+
         /// <summary>
         /// 科室
         /// </summary>
         public string Department { get; set; }
-    
+
         /// <summary>
         /// 科室类型
         /// </summary>

performance/Performance.EntityModels/Entity/ag_worktype_source.cs

 //-----------------------------------------------------------------------
 // <copyright file=" ag_worktype_source.cs">
-// * FileName: ag_worktype_source.cs 
+// * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("ag_worktype_source")]
-	public class ag_worktype_source
+    public class ag_worktype_source
     {
         /// <summary>
         /// 

performance/Performance.EntityModels/Entity/as_assess.cs

@@ -7,25 +7,25 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 考核类别
     /// </summary>
     [Table("as_assess")]
-	public class as_assess
+    public class as_assess
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 绩效ID
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-    
+
         /// <summary>
         /// 考核类别
         /// </summary>

performance/Performance.EntityModels/Entity/as_columns.cs

@@ -7,40 +7,40 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 考核列头
     /// </summary>
     [Table("as_columns")]
-	public class as_columns
+    public class as_columns
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 考核类别
         /// </summary>
         public Nullable<int> AssessID { get; set; }
-    
+
         /// <summary>
         /// 父级列头ID
         /// </summary>
         public Nullable<int> ParentID { get; set; }
-    
+
         /// <summary>
         /// 列头名称
         /// </summary>
         public string ColumnName { get; set; }
-    
+
         /// <summary>
         /// 原始模板ID
         /// </summary>
         public Nullable<int> TempColumnID { get; set; }
-    
+
         /// <summary>
         /// 排序
         /// </summary>

performance/Performance.EntityModels/Entity/as_data.cs

@@ -7,35 +7,35 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 考核数据
     /// </summary>
     [Table("as_data")]
-	public class as_data
+    public class as_data
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-    
+
         /// <summary>
         /// 考核类别ID
         /// </summary>
         public Nullable<int> AssessID { get; set; }
-    
+
         /// <summary>
         /// 科室
         /// </summary>
         public string Department { get; set; }
-    
+
         /// <summary>
         /// 行数据JSON
         /// </summary>

performance/Performance.EntityModels/Entity/as_tempassess.cs

@@ -3,24 +3,23 @@
 // * FileName: 考核类别.cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 考核类别
     /// </summary>
     [Table("as_tempassess")]
-	public class as_tempassess
+    public class as_tempassess
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 考核类别
         /// </summary>

performance/Performance.EntityModels/Entity/as_tempcolumns.cs

@@ -7,35 +7,35 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 考核列头
     /// </summary>
     [Table("as_tempcolumns")]
-	public class as_tempcolumns
+    public class as_tempcolumns
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 考核类别
         /// </summary>
         public Nullable<int> AssessID { get; set; }
-    
+
         /// <summary>
         /// 父级列头ID
         /// </summary>
         public Nullable<int> ParentID { get; set; }
-    
+
         /// <summary>
         /// 列头名称
         /// </summary>
         public string ColumnName { get; set; }
-    
+
         /// <summary>
         /// 排序
         /// </summary>

performance/Performance.EntityModels/Entity/cof_accounting.cs

-//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
 // <copyright file=" cof_accounting.cs">
 // * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 

performance/Performance.EntityModels/Entity/cof_again.cs

@@ -7,40 +7,40 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("cof_again")]
-	public class cof_again
+    public class cof_again
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-    
+
         /// <summary>
         /// 科室
         /// </summary>
         public string Department { get; set; }
-    
+
         /// <summary>
         /// 1 职称绩效 2 工作量绩效 3 满勤天数
         /// </summary>
         public Nullable<int> Type { get; set; }
-    
+
         /// <summary>
         /// 参数名称
         /// </summary>
         public string TypeName { get; set; }
-    
+
         /// <summary>
         /// 参数值
         /// </summary>

performance/Performance.EntityModels/Entity/cof_alias.cs

-using System.ComponentModel.DataAnnotations;
+//-----------------------------------------------------------------------
+// <copyright file=" cof_alias.cs">
+// * FileName: 别名配置.cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Performance.EntityModels
 {
+    /// <summary>
+    /// 别名配置
+    /// </summary>
     [Table("cof_alias")]
     public class cof_alias
     {
+        /// <summary>
+        /// 
+        /// </summary>
         [Key]
         public int Id { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
         public int HospitalId { get; set; }
+
+        /// <summary>
+        /// 前端路由地址
+        /// </summary>
         public string Route { get; set; }
+
+        /// <summary>
+        /// 描述名称
+        /// </summary>
         public string Name { get; set; }
+
+        /// <summary>
+        /// 原始名
+        /// </summary>
         public string OriginalName { get; set; }
+
+        /// <summary>
+        /// 别名
+        /// </summary>
         public string Alias { get; set; }
-        public int States { get; set; }
+
+        /// <summary>
+        /// 状态 1 可用 0 禁用
+        /// </summary>
+        public Nullable<int> States { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/cof_check.cs

@@ -7,25 +7,25 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 上传excel文件校验配置
     /// </summary>
     [Table("cof_check")]
-	public class cof_check
+    public class cof_check
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// sheet类型。1、无法识别，2、医院人员名单，3、收入，4、其他收入，5、支出，6、加班，7、工作量，8、特殊核算单元，9、临床科室医护绩效测算基础
         /// </summary>
         public Nullable<int> Type { get; set; }
-    
+
         /// <summary>
         /// 单元格列头名称
         /// </summary>

performance/Performance.EntityModels/Entity/cof_cmi.cs

@@ -7,35 +7,35 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("cof_cmi")]
-	public class cof_cmi
+    public class cof_cmi
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public int AllotId { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public int UnitType { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public string AccountingUnit { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>

performance/Performance.EntityModels/Entity/cof_depttype.cs

@@ -7,30 +7,30 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 科室类型
     /// </summary>
     [Table("cof_depttype")]
-	public class cof_depttype
+    public class cof_depttype
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-    
+
         /// <summary>
         /// 科室
         /// </summary>
         public string Charge { get; set; }
-    
+
         /// <summary>
         /// 可是分类
         /// </summary>

performance/Performance.EntityModels/Entity/cof_director.cs

@@ -7,40 +7,40 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 规模绩效、效率绩效计算系数配置
     /// </summary>
     [Table("cof_director")]
-	public class cof_director
+    public class cof_director
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-    
+
         /// <summary>
         /// 科室
         /// </summary>
         public string Department { get; set; }
-    
+
         /// <summary>
         /// 绩效类型
         /// </summary>
         public string TypeName { get; set; }
-    
+
         /// <summary>
         /// 职务名称
         /// </summary>
         public string JobTitle { get; set; }
-    
+
         /// <summary>
         /// 绩效系数
         /// </summary>

performance/Performance.EntityModels/Entity/cof_drugprop.cs

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

performance/Performance.EntityModels/Entity/cof_drugtype.cs

@@ -7,19 +7,19 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 药占比费用列头名称
     /// </summary>
     [Table("cof_drugtype")]
-	public class cof_drugtype
+    public class cof_drugtype
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
+        public int ID { get; set; }
 
         /// <summary>
         /// 
@@ -30,12 +30,12 @@ public class cof_drugtype
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-    
+
         /// <summary>
         /// 费用名称
         /// </summary>
         public string Charge { get; set; }
-    
+
         /// <summary>
         /// 费用类别
         /// </summary>

performance/Performance.EntityModels/Entity/cof_guarantee.cs

@@ -7,40 +7,40 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 保底科室配置
     /// </summary>
     [Table("cof_guarantee")]
-	public class cof_guarantee
+    public class cof_guarantee
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotId { get; set; }
-    
+
         /// <summary>
         /// 优先级
         /// </summary>
         public Nullable<int> Priority { get; set; }
-    
+
         /// <summary>
         /// 核算单元类型 1 医生组 2 护理组 3 医技组
         /// </summary>
         public Nullable<int> UnitType { get; set; }
-    
+
         /// <summary>
         /// 保底科室
         /// </summary>
         public string Target { get; set; }
-    
+
         /// <summary>
         /// 保底来源科室
         /// </summary>

performance/Performance.EntityModels/Entity/cof_hrp_department.cs

@@ -3,39 +3,38 @@
 // * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("cof_hrp_department")]
-	public class cof_hrp_department
+    public class cof_hrp_department
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        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>

performance/Performance.EntityModels/Entity/cof_income.cs

@@ -7,35 +7,35 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// ICU医生护士有效收入汇总计算系数
     /// </summary>
     [Table("cof_income")]
-	public class cof_income
+    public class cof_income
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-    
+
         /// <summary>
         /// 关键字匹配
         /// </summary>
         public string SheetNameKeyword { get; set; }
-    
+
         /// <summary>
         /// 分组名称（医生、护理）
         /// </summary>
         public string UnitName { get; set; }
-    
+
         /// <summary>
         /// 有效收入占比
         /// </summary>

performance/Performance.EntityModels/Entity/cof_singlefactor.cs

@@ -7,40 +7,40 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 特殊绩效项指标
     /// </summary>
     [Table("cof_singlefactor")]
-	public class cof_singlefactor
+    public class cof_singlefactor
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 1 工作量
         /// </summary>
         public Nullable<int> Type { get; set; }
-    
+
         /// <summary>
         /// 类型名称
         /// </summary>
         public string TypeName { get; set; }
-    
+
         /// <summary>
         /// 绩效核算单元
         /// </summary>
         public string AccountingUnit { get; set; }
-    
+
         /// <summary>
         /// 绩效项系数
         /// </summary>
         public string ItemName { get; set; }
-    
+
         /// <summary>
         /// 系数值
         /// </summary>

performance/Performance.EntityModels/Entity/cof_workitem.cs

@@ -7,30 +7,30 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("cof_workitem")]
-	public class cof_workitem
+    public class cof_workitem
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-    
+
         /// <summary>
         /// 工作量中需做运算的项
         /// </summary>
         public string Item { get; set; }
-    
+
         /// <summary>
         /// 1. 药占比 2. CMI
         /// </summary>

performance/Performance.EntityModels/Entity/cof_workloadtype.cs

@@ -7,35 +7,35 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 工作量分类
     /// </summary>
     [Table("cof_workloadtype")]
-	public class cof_workloadtype
+    public class cof_workloadtype
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        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>

performance/Performance.EntityModels/Entity/cof_workyear.cs

@@ -7,35 +7,35 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 工龄对应绩效系数配置
     /// </summary>
     [Table("cof_workyear")]
-	public class cof_workyear
+    public class cof_workyear
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-    
+
         /// <summary>
         /// 最大工龄范围（小于）
         /// </summary>
         public Nullable<decimal> MaxRange { get; set; }
-    
+
         /// <summary>
         /// 最小工龄范围（大于等于）
         /// </summary>
         public Nullable<decimal> MinRange { get; set; }
-    
+
         /// <summary>
         /// 绩效系数
         /// </summary>

performance/Performance.EntityModels/Entity/collect_data.cs

@@ -3,79 +3,78 @@
 // * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("collect_data")]
-	public class collect_data
+    public class collect_data
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public int AllotID { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public string SheetName { get; set; }
-    
+
         /// <summary>
         /// 核算单元类别 1 医生组 2护理组 3医技组
         /// </summary>
         public string UnitType { get; set; }
-    
+
         /// <summary>
         /// 行号
         /// </summary>
         public int RowNumber { get; set; }
-    
+
         /// <summary>
         /// 人员姓名
         /// </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

@@ -3,59 +3,58 @@
 // * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("collect_permission")]
-	public class collect_permission
+    public class collect_permission
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public int HospitalId { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public int UserId { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public int SheetType { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public string SheetName { get; set; }
-    
+
         /// <summary>
         /// 列头名称
         /// </summary>
         public string HeadName { get; set; }
-    
+
         /// <summary>
         /// 0 可见  1 只读
         /// </summary>
         public int Visible { get; set; }
-    
+
         /// <summary>
         /// 0 可读可写  1 只读
         /// </summary>
         public int Readnoly { get; set; }
-    
+
         /// <summary>
         /// 是否附带上次绩效 0 附带  1 不附带
         /// </summary>

performance/Performance.EntityModels/Entity/cost_transfer.cs

+//-----------------------------------------------------------------------
+// <copyright file=" cost_transfer.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("cost_transfer")]
+    public class cost_transfer
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int AllotId { get; set; }
+
+        /// <summary>
+        /// 申请者核算单元类型
+        /// </summary>
+        public string ApplicantUnitType { get; set; }
+
+        /// <summary>
+        /// 申请者科室
+        /// </summary>
+        public string ApplicantDepartment { get; set; }
+
+        /// <summary>
+        /// 审核者核算单元类型
+        /// </summary>
+        public string AdoptedUnitType { get; set; }
+
+        /// <summary>
+        /// 审核者科室
+        /// </summary>
+        public string AdoptedDepartment { get; set; }
+
+        /// <summary>
+        /// 0 未审核 1 全部通过 2 部分通过 3 全部驳回 4 含有下发驳回
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 0 未审核 1 全部通过 2 部分通过 3 全部驳回 4 含有下发驳回
+        /// </summary>
+        public int AdminStatus { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/cost_transfer_item.cs

+//-----------------------------------------------------------------------
+// <copyright file=" cost_transfer_item.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("cost_transfer_item")]
+    public class cost_transfer_item
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int TransferId { get; set; }
+
+        /// <summary>
+        /// 来源，sheet名称
+        /// </summary>
+        public string Source { get; set; }
+
+        /// <summary>
+        /// 费用类型
+        /// </summary>
+        public string Category { get; set; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public Nullable<decimal> Amount { get; set; }
+
+        /// <summary>
+        /// 分割比例
+        /// </summary>
+        public Nullable<decimal> Ratio { get; set; }
+
+        /// <summary>
+        /// 实际金额
+        /// </summary>
+        public Nullable<decimal> CalculationAmount { get; set; }
+
+        /// <summary>
+        /// 是否使用分割比例
+        /// </summary>
+        public int IsUseRatio { get; set; }
+                
+        /// <summary>
+        /// 申请理由
+        /// </summary>
+        public string ApplicationRemark { get; set; }
+
+        /// <summary>
+        /// 科室备注
+        /// </summary>
+        public string DepartmentRemark { get; set; }
+
+        /// <summary>
+        /// 管理员备注
+        /// </summary>
+        public string AdminRemark { get; set; }
+        
+        /// <summary>
+        /// 0 默认 1 通过 2 驳回 3 下发驳回 4 撤回
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 0 默认 1 通过 2 驳回 3 下发驳回 4 撤回
+        /// </summary>
+        public int AdminStatus { get; set; }
+
+        /// <summary>
+        /// 数据是否被写入
+        /// </summary>
+        public int IsWrited { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/cust_script.cs

@@ -3,54 +3,53 @@
 // * FileName: 自定义导出.cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 自定义导出
     /// </summary>
     [Table("cust_script")]
-	public class cust_script
+    public class cust_script
     {
         /// <summary>
         /// 
         /// </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/ex_item.cs

@@ -7,55 +7,55 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("ex_item")]
-	public class ex_item
+    public class ex_item
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> ModuleId { get; set; }
-    
+
         /// <summary>
         /// 绩效考核项
         /// </summary>
         public string ItemName { get; set; }
-    
+
         /// <summary>
         /// 默认系数或医生系数
         /// </summary>
         public Nullable<decimal> FactorValue1 { get; set; }
-    
+
         /// <summary>
         /// 护理系数
         /// </summary>
         public Nullable<decimal> FactorValue2 { get; set; }
-    
+
         /// <summary>
         /// 医技系数
         /// </summary>
         public Nullable<decimal> FactorValue3 { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> TypeId { get; set; }
-    
+
         /// <summary>
         /// 数据库地址
         /// </summary>
         public Nullable<int> ConfigId { get; set; }
-    
+
         /// <summary>
         /// 只读 0、否 1、是
         /// </summary>

performance/Performance.EntityModels/Entity/ex_module.cs

@@ -7,50 +7,50 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("ex_module")]
-	public class ex_module
+    public class ex_module
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> HospitalId { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> SheetType { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public string ModuleName { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public string Description { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> TypeId { get; set; }
-    
+
         /// <summary>
         /// 数据库地址
         /// </summary>
         public Nullable<int> ConfigId { get; set; }
-    
+
         /// <summary>
         /// 只读 0、否 1、是
         /// </summary>

performance/Performance.EntityModels/Entity/ex_result.cs

@@ -7,70 +7,70 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("ex_result")]
-	public class ex_result
+    public class ex_result
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public int AllotId { get; set; }
-    
+
         /// <summary>
         /// 科室
         /// </summary>
         public string Department { get; set; }
-    
+
         /// <summary>
         /// 医生姓名
         /// </summary>
         public string DoctorName { get; set; }
-    
+
         /// <summary>
         /// 人员工号
         /// </summary>
         public string PersonnelNumber { get; set; }
-    
+
         /// <summary>
         /// 费用类型
         /// </summary>
         public string Category { get; set; }
-    
+
         /// <summary>
         /// 费用
         /// </summary>
         public Nullable<decimal> Fee { get; set; }
-    
+
         /// <summary>
         /// 来源
         /// </summary>
         public string Source { get; set; }
-    
+
         /// <summary>
         /// 数据库类型1、Sql Server  2、Orcale
         /// </summary>
         public int DatabaseType { get; set; }
-    
+
         /// <summary>
         /// 数据库配置Id
         /// </summary>
         public int ConfigId { get; set; }
-    
+
         /// <summary>
         /// 创建时间
         /// </summary>
         public Nullable<DateTime> CreateTime { get; set; }
-    
+
         /// <summary>
         /// 1 删除 0 未删除
         /// </summary>

performance/Performance.EntityModels/Entity/ex_script.cs

@@ -3,44 +3,43 @@
 // * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("ex_script")]
-	public class ex_script
+    public class ex_script
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 执行sql
         /// </summary>
         public string ExecScript { get; set; }
-    
+
         /// <summary>
         /// 数据库类型1、Sql Server  2、Orcale
         /// </summary>
         public int DatabaseType { get; set; }
-    
+
         /// <summary>
         /// ExTypeId
         /// </summary>
         public int TypeId { get; set; }
-    
+
         /// <summary>
         /// 配置Id
         /// </summary>
         public int ConfigId { get; set; }
-    
+
         /// <summary>
         /// 是否可用 1 可用 2 不可用
         /// </summary>

performance/Performance.EntityModels/Entity/ex_special.cs

@@ -7,50 +7,50 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("ex_special")]
-	public class ex_special
+    public class ex_special
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        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>
         /// 
         /// </summary>
         public Nullable<int> TypeId { get; set; }
-    
+
         /// <summary>
         /// 数据库地址
         /// </summary>

performance/Performance.EntityModels/Entity/ex_type.cs

@@ -3,39 +3,38 @@
 // * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("ex_type")]
-	public class ex_type
+    public class ex_type
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 医院Id
         /// </summary>
         public int HospitalId { get; set; }
-    
+
         /// <summary>
         /// 名称
         /// </summary>
         public string EName { get; set; }
-    
+
         /// <summary>
         /// 描述
         /// </summary>
         public string Description { get; set; }
-    
+
         /// <summary>
         /// 来源
         /// </summary>

performance/Performance.EntityModels/Entity/his_data.cs

@@ -7,90 +7,90 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("his_data")]
-	public class his_data
+    public class his_data
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        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>

performance/Performance.EntityModels/Entity/his_import_account.cs

@@ -7,60 +7,60 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("his_import_account")]
-	public class his_import_account
+    public class his_import_account
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        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>

performance/Performance.EntityModels/Entity/his_import_baiscnorm.cs

@@ -7,60 +7,60 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("his_import_baiscnorm")]
-	public class his_import_baiscnorm
+    public class his_import_baiscnorm
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        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>

performance/Performance.EntityModels/Entity/his_import_clinic.cs

@@ -7,75 +7,75 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("his_import_clinic")]
-	public class his_import_clinic
+    public class his_import_clinic
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        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>

performance/Performance.EntityModels/Entity/his_importdata.cs

@@ -7,85 +7,85 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("his_importdata")]
-	public class his_importdata
+    public class his_importdata
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        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 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>

performance/Performance.EntityModels/Entity/his_script.cs

 //-----------------------------------------------------------------------
 // <copyright file=" his_script.cs">
-// * FileName: .cs
+// * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
@@ -10,19 +10,19 @@
 namespace Performance.EntityModels
 {
     /// <summary>
-    ///
+    /// 
     /// </summary>
     [Table("his_script")]
     public class his_script
     {
         /// <summary>
-        ///
+        /// 
         /// </summary>
         [Key]
         public int Id { get; set; }
 
         /// <summary>
-        ///
+        /// 
         /// </summary>
         public Nullable<int> HospitalId { get; set; }
 

performance/Performance.EntityModels/Entity/hos_personfee.cs

@@ -7,55 +7,55 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("hos_personfee")]
-	public class hos_personfee
+    public class hos_personfee
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        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 Source { get; set; }
-    
+
         /// <summary>
         /// 开单科室
         /// </summary>
         public string DeptName { get; set; }
-    
+
         /// <summary>
         /// 费用类型
         /// </summary>
         public string Category { get; set; }
-    
+
         /// <summary>
         /// 人次
         /// </summary>
         public Nullable<int> PersonTime { get; set; }
-    
+
         /// <summary>
         /// 费用
         /// </summary>

performance/Performance.EntityModels/Entity/im_accountbasic.cs

@@ -7,225 +7,225 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 科室核算导入信息
     /// </summary>
     [Table("im_accountbasic")]
-	public class im_accountbasic
+    public class im_accountbasic
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> SheetID { get; set; }
-    
+
         /// <summary>
         /// 核算单元类别 1 医生组 2护理组 3医技组
         /// </summary>
         public Nullable<int> UnitType { get; set; }
-    
+
         /// <summary>
         /// 核算单元（医生组）
         /// </summary>
         public string DoctorAccountingUnit { get; set; }
-    
+
         /// <summary>
         /// 核算单元（护理组）
         /// </summary>
         public string NurseAccountingUnit { get; set; }
-    
+
         /// <summary>
         /// 科室
         /// </summary>
         public string Department { get; set; }
-    
+
         /// <summary>
         /// 是否带入平均计算 是 否
         /// </summary>
         public string IncludeAvgCalculate { get; set; }
-    
+
         /// <summary>
         /// 定科人数
         /// </summary>
         public Nullable<decimal> PermanentStaff { get; set; }
-    
+
         /// <summary>
         /// 科主任数量
         /// </summary>
         public Nullable<decimal> DoctorDirectorNumber { get; set; }
-    
+
         /// <summary>
         /// 核算单元医生数量
         /// </summary>
         public Nullable<decimal> DoctorNumber { get; set; }
-    
+
         /// <summary>
         /// 医生基础系数
         /// </summary>
         public Nullable<decimal> DoctorBasicFactor { get; set; }
-    
+
         /// <summary>
         /// 倾斜系数
         /// </summary>
         public Nullable<decimal> DoctorSlopeFactor { get; set; }
-    
+
         /// <summary>
         /// 规模绩效系数
         /// </summary>
         public Nullable<decimal> DoctorScale { get; set; }
-    
+
         /// <summary>
         /// 效率绩效系数
         /// </summary>
         public Nullable<decimal> DoctorEffic { get; set; }
-    
+
         /// <summary>
         /// 发放系数
         /// </summary>
         public Nullable<decimal> DoctorGrant { get; set; }
-    
+
         /// <summary>
         /// 其他绩效1
         /// </summary>
         public Nullable<decimal> DoctorOtherPerfor1 { get; set; }
-    
+
         /// <summary>
         /// 其他绩效2
         /// </summary>
         public Nullable<decimal> DoctorOtherPerfor2 { get; set; }
-    
+
         /// <summary>
         /// 药占比奖罚
         /// </summary>
         public Nullable<decimal> MedicineExtra { get; set; }
-    
+
         /// <summary>
         /// 材料占比奖罚
         /// </summary>
         public Nullable<decimal> MaterialsExtra { get; set; }
-    
+
         /// <summary>
         /// 医院奖罚
         /// </summary>
         public Nullable<decimal> DoctorExtra { get; set; }
-    
+
         /// <summary>
         /// 考核对分率
         /// </summary>
         public Nullable<decimal> DoctorScoringAverage { get; set; }
-    
+
         /// <summary>
         /// 调节系数
         /// </summary>
         public Nullable<decimal> DoctorAdjustFactor { get; set; }
-    
+
         /// <summary>
         /// 保底绩效参考标准
         /// </summary>
         public string MinimumReference { get; set; }
-    
+
         /// <summary>
         /// 保底绩效系数
         /// </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<DateTime> UpdateDate { get; set; }
-    
+
         /// <summary>
         /// 
         /// </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_data.cs

@@ -7,110 +7,110 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("im_data")]
-	public class im_data
+    public class im_data
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> SheetID { get; set; }
-    
+
         /// <summary>
         /// 核算单元类别 1 医生组 2护理组 3医技组
         /// </summary>
         public Nullable<int> UnitType { get; set; }
-    
+
         /// <summary>
         /// 行号
         /// </summary>
         public Nullable<int> RowNumber { get; set; }
-    
+
         /// <summary>
         /// 人员姓名
         /// </summary>
         public string EmployeeName { get; set; }
-    
+
         /// <summary>
         /// 人员工号
         /// </summary>
         public string JobNumber { get; set; }
-    
+
         /// <summary>
         /// 核算单元名称
         /// </summary>
         public string AccountingUnit { get; set; }
-    
+
         /// <summary>
         /// 科室名称
         /// </summary>
         public string Department { get; set; }
-    
+
         /// <summary>
         /// 列头类型名称
         /// </summary>
         public string TypeName { get; set; }
-    
+
         /// <summary>
         /// 单元格value
         /// </summary>
         public Nullable<decimal> CellValue { get; set; }
-    
+
         /// <summary>
         /// 1 加 2 减 3 乘
         /// </summary>
         public Nullable<int> ComputRule { get; set; }
-    
+
         /// <summary>
         /// 1 汇总  2原始数据
         /// </summary>
         public Nullable<int> IsTotal { get; set; }
-    
+
         /// <summary>
         /// 是否带入系数计算 1 带入 2 不带入
         /// </summary>
         public Nullable<int> IsFactor { get; set; }
-    
+
         /// <summary>
         /// 系数值
         /// </summary>
         public Nullable<decimal> FactorValue { get; set; }
-    
+
         /// <summary>
         /// 单元格注释
         /// </summary>
         public string Annotation { get; set; }
-    
+
         /// <summary>
         /// 单元格备注
         /// </summary>
         public string Remark { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public string SignID { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<DateTime> UpdateDate { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>

performance/Performance.EntityModels/Entity/im_employee.cs

@@ -7,170 +7,170 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("im_employee")]
-	public class im_employee
+    public class im_employee
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-    
+
         /// <summary>
         /// sheet页id
         /// </summary>
         public Nullable<int> SheetID { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> RowNumber { get; set; }
-    
+
         /// <summary>
         /// 科室类别(例如 医技科室 临床科室 其他科室)
         /// </summary>
         public string AccountType { get; set; }
-    
+
         /// <summary>
         /// 核算单元
         /// </summary>
         public string AccountingUnit { get; set; }
-    
+
         /// <summary>
         /// 科室名称
         /// </summary>
         public string Department { get; set; }
-    
+
         /// <summary>
         /// 绩效基数核算参考对象
         /// </summary>
         public string FitPeople { get; set; }
-    
+
         /// <summary>
         /// 绩效基础核算参考值
         /// </summary>
         public Nullable<decimal> FitPeopleValue { get; set; }
-    
+
         /// <summary>
         /// 绩效基数核算参考对象取值比例（如临床科室护士*95%）
         /// </summary>
         public Nullable<decimal> FitPeopleRatio { get; set; }
-    
+
         /// <summary>
         /// 人员工号
         /// </summary>
         public string PersonnelNumber { get; set; }
-    
+
         /// <summary>
         /// 医生姓名
         /// </summary>
         public string DoctorName { get; set; }
-    
+
         /// <summary>
         /// 职称
         /// </summary>
         public string JobTitle { get; set; }
-    
+
         /// <summary>
         /// 岗位系数
         /// </summary>
         public Nullable<decimal> PostCoefficient { get; set; }
-    
+
         /// <summary>
         /// 参加工作时间
         /// </summary>
         public Nullable<DateTime> WorkTime { get; set; }
-    
+
         /// <summary>
         /// 考核得分率
         /// </summary>
         public Nullable<decimal> ScoreAverageRate { get; set; }
-    
+
         /// <summary>
         /// 出勤率
         /// </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>
         /// 其他绩效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; }
-    
+
         /// <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>
         public Nullable<DateTime> UpdateDate { get; set; }
-    
+
         /// <summary>
         /// 
         /// </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

@@ -7,170 +7,170 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 
     /// </summary>
     [Table("im_employee_clinic")]
-	public class im_employee_clinic
+    public class im_employee_clinic
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotID { get; set; }
-    
+
         /// <summary>
         /// sheet页id
         /// </summary>
         public Nullable<int> SheetID { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> RowNumber { get; set; }
-    
+
         /// <summary>
         /// 核算单元分类
         /// </summary>
         public string UnitType { get; set; }
-    
+
         /// <summary>
         /// 核算单元
         /// </summary>
         public string AccountingUnit { get; set; }
-    
+
         /// <summary>
         /// 科室名称
         /// </summary>
         public string Department { get; set; }
-    
+
         /// <summary>
         /// 人员工号
         /// </summary>
         public string PersonnelNumber { get; set; }
-    
+
         /// <summary>
         /// 医生姓名
         /// </summary>
         public string DoctorName { get; set; }
-    
+
         /// <summary>
         /// 职称
         /// </summary>
         public string JobTitle { get; set; }
-    
+
         /// <summary>
         /// 基础绩效系数
         /// </summary>
         public Nullable<decimal> Basics { get; set; }
-    
+
         /// <summary>
         /// 岗位系数
         /// </summary>
         public Nullable<decimal> PostCoefficient { get; set; }
-    
+
         /// <summary>
         /// 效率绩效系数
         /// </summary>
         public Nullable<decimal> Efficiency { get; set; }
-    
+
         /// <summary>
         /// 规模绩效系数
         /// </summary>
         public Nullable<decimal> Scale { get; set; }
-    
+
         /// <summary>
         /// 管理绩效发放系数
         /// </summary>
         public Nullable<decimal> Management { get; set; }
-    
+
         /// <summary>
         /// 考核得分率
         /// </summary>
         public Nullable<decimal> ScoreAverageRate { get; set; }
-    
+
         /// <summary>
         /// 出勤率
         /// </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> OtherManagePerfor { get; set; }
-    
+
         /// <summary>
         /// 夜班费
         /// </summary>
         public Nullable<decimal> NightWorkPerfor { 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>
         public Nullable<DateTime> UpdateDate { get; set; }
-    
+
         /// <summary>
         /// 
         /// </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>