Merge branch 'feature/划拨' into release/v20210625绩效划拨二次分配合并

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, request.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)
+        {
+            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);
+
+            result.deparment = user.Department ?? "";
+            return new ApiResponse(ResponseType.OK, result);
+        }
+
+        /// <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);
+        }
+    }
+}

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

@@ -697,6 +697,40 @@
             </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)">
+            <summary>
+            
+            </summary>
+            <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.EmployeeController.GetEmployeeList(Performance.DtoModels.EmployeeRequest)">
             <summary>
             获取人员列表

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

@@ -158,11 +158,14 @@
             <summary> 归档 </summary>
         </member>
         <member name="F:Performance.DtoModels.AllotStates.Wait">
-            <summary> 归档 </summary>
+            <summary> 等待 </summary>
         </member>
         <member name="F:Performance.DtoModels.AllotStates.GenerateAccomplish">
             <summary> 绩效结果解析成功 </summary>
         </member>
+        <member name="F:Performance.DtoModels.AllotStates.Issue">
+            <summary> 下发 </summary>
+        </member>
         <member name="F:Performance.DtoModels.AgWorkloadType.SingleAwards">
             <summary>
             单项奖励
@@ -2950,6 +2953,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.Api/wwwroot/Performance.EntityModels.xml

@@ -1181,7 +1181,7 @@
         </member>
         <member name="P:Performance.EntityModels.ag_secondallot.SubmitType">
             <summary>
-            提交类型 1 使用模板 2 其他类型数据
+            提交类型 1使用模板 2 其他类型数据
             </summary>
         </member>
         <member name="P:Performance.EntityModels.ag_secondallot.SubmitTime">
@@ -1381,7 +1381,7 @@
         </member>
         <member name="P:Performance.EntityModels.ag_workload.WorkTypeId">
             <summary>
-            1、单项奖励 2、工作量占比 ..（自定义占比）
+            -1、单项奖励 0、工作量占比 ..（自定义占比）
             </summary>
         </member>
         <member name="T:Performance.EntityModels.ag_workload_source">
@@ -1431,12 +1431,12 @@
         </member>
         <member name="P:Performance.EntityModels.ag_workload_source.WorkTypeId">
             <summary>
-            1、单项奖励 2、工作量占比 ..（自定义占比）
+            -1、单项奖励 0、工作量占比 ..（自定义占比）
             </summary>
         </member>
         <member name="T:Performance.EntityModels.ag_workload_type">
             <summary>
-            
+            二次绩效工作量绩效分类
             </summary>
         </member>
         <member name="P:Performance.EntityModels.ag_workload_type.Id">
@@ -1689,6 +1689,41 @@
             参数值
             </summary>
         </member>
+        <member name="T:Performance.EntityModels.cof_alias">
+            <summary>
+            别名配置
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cof_alias.Id">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cof_alias.Route">
+            <summary>
+            前端路由地址
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cof_alias.Name">
+            <summary>
+            描述名称
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cof_alias.OriginalName">
+            <summary>
+            原始名
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cof_alias.Alias">
+            <summary>
+            别名
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cof_alias.States">
+            <summary>
+            状态 1 可用 0 禁用
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.cof_check">
             <summary>
             上传excel文件校验配置
@@ -2194,6 +2229,116 @@
             是否附带上次绩效 0 附带  1 不附带
             </summary>
         </member>
+        <member name="T:Performance.EntityModels.cost_transfer">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer.Id">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer.AllotId">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer.ApplicantUnitType">
+            <summary>
+            申请者核算单元类型
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer.ApplicantDepartment">
+            <summary>
+            申请者科室
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer.AdoptedUnitType">
+            <summary>
+            审核者核算单元类型
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer.AdoptedDepartment">
+            <summary>
+            审核者科室
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer.Status">
+            <summary>
+            0 未审核 1 全部通过 2 部分通过 3 全部驳回 
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer.AdminStatus">
+            <summary>
+            0 未审核 1 全部通过 2 部分通过 3 全部驳回 
+            </summary>
+        </member>
+        <member name="T:Performance.EntityModels.cost_transfer_item">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer_item.Id">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer_item.TransferId">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer_item.Source">
+            <summary>
+            来源，sheet名称
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer_item.Category">
+            <summary>
+            费用类型
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer_item.Amount">
+            <summary>
+            金额
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer_item.Ratio">
+            <summary>
+            分割比例
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer_item.CalculationAmount">
+            <summary>
+            实际金额
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer_item.IsUseRatio">
+            <summary>
+            是否使用分割比例
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer_item.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer_item.Status">
+            <summary>
+            0 默认 1 通过 2 驳回 3 下发驳回
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer_item.AdminStatus">
+            <summary>
+            0 默认 1 通过 2 驳回 3 下发驳回
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer_item.IsWrited">
+            <summary>
+            数据是否被写入
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.cust_script">
             <summary>
             自定义导出
@@ -4416,7 +4561,7 @@
         </member>
         <member name="T:Performance.EntityModels.per_apr_amount_hide">
             <summary>
-            
+            医院其他绩效
             </summary>
         </member>
         <member name="P:Performance.EntityModels.per_apr_amount_hide.Id">
@@ -4944,24 +5089,24 @@
             医院Id
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.per_dept_dic.CreateTime">
+        <member name="P:Performance.EntityModels.per_dept_dic.IsVerify">
             <summary>
-            
+            0 未通过验证 1 通过验证
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.per_dept_dic.CreateUser">
+        <member name="P:Performance.EntityModels.per_dept_dic.VerifyMessage">
             <summary>
-            
+            验证失败描述
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.per_dept_dic.IsVerify">
+        <member name="P:Performance.EntityModels.per_dept_dic.CreateTime">
             <summary>
-            0 未通过验证 1 通过验证
+            
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.per_dept_dic.VerifyMessage">
+        <member name="P:Performance.EntityModels.per_dept_dic.CreateUser">
             <summary>
-            验证失败描述
+            
             </summary>
         </member>
         <member name="T:Performance.EntityModels.per_employee">
@@ -5026,7 +5171,7 @@
         </member>
         <member name="P:Performance.EntityModels.per_employee.UnitType">
             <summary>
-            核算单元类别
+            人员类别
             </summary>
         </member>
         <member name="P:Performance.EntityModels.per_employee.Attendance">
@@ -5079,24 +5224,24 @@
             备注
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.per_employee.CreateTime">
+        <member name="P:Performance.EntityModels.per_employee.IsVerify">
             <summary>
-            
+            0 未通过验证 1 通过验证
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.per_employee.CreateUser">
+        <member name="P:Performance.EntityModels.per_employee.VerifyMessage">
             <summary>
-            
+            验证失败描述
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.per_employee.IsVerify">
+        <member name="P:Performance.EntityModels.per_employee.CreateTime">
             <summary>
-            0 未通过验证 1 通过验证
+            
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.per_employee.VerifyMessage">
+        <member name="P:Performance.EntityModels.per_employee.CreateUser">
             <summary>
-            验证失败描述
+            
             </summary>
         </member>
         <member name="T:Performance.EntityModels.per_first">

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

@@ -235,6 +235,12 @@ public AutoMapperConfigs()
             CreateMap<HistoryData, report_original_surgery>()
                .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());
+
         }
 
         public void xx()

performance/Performance.DtoModels/Enum.cs

@@ -74,12 +74,15 @@ public enum AllotStates
         /// <summary> 归档 </summary>
         [Description("归档")]
         Archive = 8,
-        /// <summary> 归档 </summary>
+        /// <summary> 等待 </summary>
         [Description("等待")]
         Wait = 9,
         /// <summary> 绩效结果解析成功 </summary>
         [Description("数据验证通过")]
         GenerateAccomplish = 10,
+        /// <summary> 下发 </summary>
+        [Description("下发")]
+        Issue = 11
     }
 
     public enum AgWorkloadType

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 Remark { 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 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.EntityModels/Context/PerformanceDbContext.cs

-
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata;
-using System;
-using Performance.EntityModels.Entity;
 
 namespace Performance.EntityModels
 {
@@ -96,6 +92,10 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
         public virtual DbSet<collect_data> collect_data { get; set; }
         /// <summary>  </summary>
         public virtual DbSet<collect_permission> collect_permission { get; set; }
+
+        public virtual DbSet<cost_transfer> cost_transfer { get; set; }
+
+        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/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_secondallot.cs

@@ -82,7 +82,7 @@ public class ag_secondallot
         public Nullable<int> Status { get; set; }
 
         /// <summary>
-        /// 提交类型 1 使用模板 2 其他类型数据
+        /// 提交类型 1使用模板 2 其他类型数据
         /// </summary>
         public Nullable<int> SubmitType { get; set; }
 
@@ -125,9 +125,10 @@ public class ag_secondallot
         /// 护理部审核状态 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,7 +3,6 @@
 // * FileName: 二次绩效模板.cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 

performance/Performance.EntityModels/Entity/ag_workload.cs

@@ -57,7 +57,7 @@ public class ag_workload
         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
 {
     /// <summary>
-    /// 
+    /// 二次绩效工作量绩效分类
     /// </summary>
     [Table("ag_workload_type")]
     public class ag_workload_type

performance/Performance.EntityModels/Entity/ag_worktype_source.cs

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

performance/Performance.EntityModels/Entity/as_tempassess.cs

@@ -3,7 +3,6 @@
 // * FileName: 考核类别.cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 

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_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.Entity
+namespace Performance.EntityModels
 {
+    /// <summary>
+    /// 别名配置
+    /// </summary>
     [Table("cof_alias")]
     public class cof_alias
     {
+        /// <summary>
+        /// 
+        /// </summary>
         [Key]
         public int Id { 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_hrp_department.cs

@@ -3,7 +3,6 @@
 // * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 

performance/Performance.EntityModels/Entity/collect_data.cs

@@ -3,7 +3,6 @@
 // * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 

performance/Performance.EntityModels/Entity/collect_permission.cs

@@ -3,7 +3,6 @@
 // * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 

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 Remark { get; set; }
+
+        /// <summary>
+        /// 0 默认 1 通过 2 驳回 3 下发驳回
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 0 默认 1 通过 2 驳回 3 下发驳回
+        /// </summary>
+        public int AdminStatus { get; set; }
+
+        /// <summary>
+        /// 数据是否被写入
+        /// </summary>
+        public int IsWrited { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/cust_script.cs

@@ -3,7 +3,6 @@
 // * FileName: 自定义导出.cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 

performance/Performance.EntityModels/Entity/ex_script.cs

@@ -3,7 +3,6 @@
 // * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 

performance/Performance.EntityModels/Entity/ex_type.cs

@@ -3,7 +3,6 @@
 // * FileName: .cs 
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 

performance/Performance.EntityModels/Entity/per_apr_amount_hide.cs

-//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
 // <copyright file=" per_apr_amount_hide.cs">
-// * FileName: .cs 
+// * FileName: 医院其他绩效.cs 
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
@@ -10,7 +10,7 @@
 namespace Performance.EntityModels
 {
     /// <summary>
-    /// 
+    /// 医院其他绩效
     /// </summary>
     [Table("per_apr_amount_hide")]
     public class per_apr_amount_hide
@@ -84,7 +84,7 @@ public class per_apr_amount_hide
         /// <summary>
         /// 0 未通过验证 1 通过验证
         /// </summary>
-        public int? IsVerify { get; set; }
+        public Nullable<int> IsVerify { get; set; }
 
         /// <summary>
         /// 验证失败描述

performance/Performance.EntityModels/Entity/per_dept_dic.cs

@@ -52,23 +52,23 @@ public class per_dept_dic
         public Nullable<int> HospitalId { get; set; }
 
         /// <summary>
-        /// 
+        /// 0 未通过验证 1 通过验证
         /// </summary>
-        public Nullable<DateTime> CreateTime { get; set; }
+        public Nullable<int> IsVerify { get; set; }
 
         /// <summary>
-        /// 
+        /// 验证失败描述
         /// </summary>
-        public Nullable<int> CreateUser { get; set; }
+        public string VerifyMessage { get; set; }
 
         /// <summary>
-        /// 0 未通过验证 1 通过验证
+        /// 
         /// </summary>
-        public int? IsVerify { get; set; }
+        public Nullable<DateTime> CreateTime { get; set; }
 
         /// <summary>
-        /// 验证失败描述
+        /// 
         /// </summary>
-        public string VerifyMessage { get; set; }
+        public Nullable<int> CreateUser { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/per_employee.cs

@@ -72,7 +72,7 @@ public class per_employee
         public string JobTitle { get; set; }
 
         /// <summary>
-        /// 核算单元类别
+        /// 人员类别
         /// </summary>
         public string UnitType { get; set; }
 
@@ -127,23 +127,23 @@ public class per_employee
         public string Remark { get; set; }
 
         /// <summary>
-        /// 
+        /// 0 未通过验证 1 通过验证
         /// </summary>
-        public Nullable<DateTime> CreateTime { get; set; }
+        public Nullable<int> IsVerify { get; set; }
 
         /// <summary>
-        /// 
+        /// 验证失败描述
         /// </summary>
-        public Nullable<int> CreateUser { get; set; }
+        public string VerifyMessage { get; set; }
 
         /// <summary>
-        /// 0 未通过验证 1 通过验证
+        /// 
         /// </summary>
-        public int? IsVerify { get; set; }
+        public Nullable<DateTime> CreateTime { get; set; }
 
         /// <summary>
-        /// 验证失败描述
+        /// 
         /// </summary>
-        public string VerifyMessage { get; set; }
+        public Nullable<int> CreateUser { get; set; }
     }
 }