Skip to content

P
performance
Commit d0649f89 by lcx
Options

使用graphql，新增数据库实体类

parent 3667cd9c
Showing with 1768 additions and 672 deletions
performance/Performance.Api/Controllers/GraphQLController.cs 0 → 100644
using GraphQL;
using GraphQL.Types;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Performance.DtoModels;
using System.Threading.Tasks;
namespace Performance.Api
{
[AllowAnonymous]
[Route("api/graphql")]
[ApiController]
public class GraphQLController : ControllerBase
{
public ISchema performanceSchema { get; }
public IDocumentExecuter documentExecuter { get; }
public ILogger logger { get; set; }
public GraphQLController(ISchema performanceSchema, IDocumentExecuter documentExecuter, ILogger<GraphQLController> logger)
{
this.performanceSchema = performanceSchema;
this.documentExecuter = documentExecuter;
this.logger = logger;
}
/// <summary>
/// GraphQL请求地址
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
[HttpPost]
public async Task<ApiResponse> Post(GraphQLRequest query)
{
var result = await documentExecuter.ExecuteAsync(options =>
{
options.Schema = performanceSchema;
options.Query = query.Query;
});
if (result.Errors?.Count > 0)
{
return new ApiResponse(ResponseType.Error, result.Errors);
}
return new ApiResponse(ResponseType.OK, result.Data);
}
}
}
performance/Performance.Api/GraphQLSchema/ChartDataType.cs 0 → 100644
using GraphQL.Types;
using Performance.DtoModels;
namespace Performance.Api
{
public class ChartDataType : ObjectGraphType<ChartData>
{
public ChartDataType()
{
Field(x => x.X);
Field(x => x.Y);
Field(x => x.Name);
Field(x => x.Value);
Field(x => x.Total);
Field(x => x.Type);
}
}
}
performance/Performance.Api/GraphQLSchema/Extensions/GraphQLExtension.cs 0 → 100644
using GraphQL;
using GraphQL.Types;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Performance.Api
{
public static class GraphQLExtension
{
public static void AddGraphQLSchemaAndTypes(this IServiceCollection services)
{
//services.AddScoped<ReportDataType>();
services.AddScoped<ReportPerformanceType>();
services.AddScoped<PerformanceQuery>();
services.AddScoped<ISchema, PerformanceSchema>();
services.AddScoped<IDocumentExecuter, DocumentExecuter>();
services.AddScoped<IDependencyResolver>(provider => new FuncDependencyResolver
(
type => provider.GetRequiredService(type)
));
}
}
}
performance/Performance.Api/GraphQLSchema/GraphQLRequest.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Performance.Api
{
public class GraphQLRequest
{
public string Query { get; set; }
}
}
performance/Performance.Api/GraphQLSchema/PerformanceQuery.cs 0 → 100644
using GraphQL.Types;
using Performance.Infrastructure;
using Performance.Services;
namespace Performance.Api
{
public class PerformanceQuery : ObjectGraphType
{
public PerformanceQuery(GraphQLService service)
{
Field<ListGraphType<ReportPerformanceType>>("performances",
arguments: new QueryArguments
(
new QueryArgument<IntGraphType>() { Name = QueryParams.hospitalId },
new QueryArgument<IntGraphType>() { Name = QueryParams.year },
new QueryArgument<IntGraphType>() { Name = QueryParams.month },
new QueryArgument<StringGraphType>() { Name = QueryParams.category }
),
resolve: context =>
{
int hospitalId = context.Arguments.ContainsKey(QueryParams.hospitalId) ? ConvertHelper.TryInt(context.Arguments[QueryParams.hospitalId].ToString()) : default;
int year = context.Arguments.ContainsKey(QueryParams.year) ? ConvertHelper.TryInt(context.Arguments[QueryParams.year].ToString()) : default;
int month = context.Arguments.ContainsKey(QueryParams.month) ? ConvertHelper.TryInt(context.Arguments[QueryParams.month].ToString()) : default;
string category = context.Arguments.ContainsKey(QueryParams.category) ? context.Arguments[QueryParams.category].ToString() : string.Empty;
return service.GetPerformances(hospitalId, year, month, category);
}
);
}
}
}
performance/Performance.Api/GraphQLSchema/PerformanceSchema.cs 0 → 100644
using GraphQL;
using GraphQL.Types;
namespace Performance.Api
{
public class PerformanceSchema : Schema
{
public PerformanceSchema(PerformanceQuery query, IDependencyResolver dependencyResolver)
{
Query = query;
DependencyResolver = dependencyResolver;
}
}
}
performance/Performance.Api/GraphQLSchema/QueryParams.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Performance.Api
{
public struct QueryParams
{
public const string hospitalId = "hospitalId";
public const string year = "year";
public const string month = "month";
public const string category = "category";
}
}
performance/Performance.Api/GraphQLSchema/ReportDataType.cs 0 → 100644
using GraphQL.Types;
using Performance.DtoModels;
namespace Performance.Api
{
public class ReportDataType : ObjectGraphType<ReportData>
{
public ReportDataType()
{
Field(x => x.ReportID);
Field(x => x.ChartType, type: typeof(IdGraphType));
Field(x => x.Sort);
Field(x => x.Title);
Field(x => x.XTitle);
Field(x => x.XUnit);
Field(x => x.YTitle);
Field(x => x.YUnit);
Field(x => x.VTitle);
Field(x => x.VUnit);
Field(x => x.NTitle);
Field(x => x.NUnit);
Field(x => x.Formula);
Field(x => x.DataType);
Field(x => x.FilterValue);
Field<ListGraphType<ChartDataType>>("charData");
}
}
}
performance/Performance.Api/GraphQLSchema/ReportPerformanceType.cs 0 → 100644
using GraphQL.Types;
using Performance.EntityModels;
namespace Performance.Api
{
public class ReportPerformanceType : ObjectGraphType<report_performance>
{
public ReportPerformanceType()
{
Field(x => x.Id);
Field(x => x.HospitalId);
Field(x => x.Year);
Field(x => x.Month);
Field(x => x.PersonnelName);
Field(x => x.PersonnelNumber);
Field(x => x.AccountingUnit);
Field(x => x.Department);
Field(x => x.Category);
Field(x => x.ItemName);
Field(x => x.CurrentValue);
Field(x => x.LastIssueValue);
Field(x => x.SamePeriodValue);
Field(x => x.BudgetValue);
}
}
}
performance/Performance.Api/Performance.Api.csproj
......@@ -39,6 +39,7 @@
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="6.0.0" />
<PackageReference Include="CSRedisCore" Version="3.0.45" />
<PackageReference Include="FluentValidation.AspNetCore" Version="8.1.3" />
<PackageReference Include="GraphQL" Version="2.4.0" />
<PackageReference Include="Hangfire" Version="1.6.22" />
<PackageReference Include="Hangfire.MySql.Core" Version="2.2.2" />
<PackageReference Include="Microsoft.AspNetCore.App" />
......
performance/Performance.Api/Startup.cs
......@@ -54,6 +54,8 @@ public void ConfigureServices(IServiceCollection services)
var connection = services.BuildServiceProvider().GetService<IOptions<AppConnection>>();
services.AddGraphQLSchemaAndTypes();
#region json & fluentvalidation & filter
services
......
performance/Performance.Api/wwwroot/Performance.Api.xml
......@@ -1388,6 +1388,13 @@
返回日志
</summary>
</member>
<member name="M:Performance.Api.GraphQLController.Post(Performance.Api.GraphQLRequest)">
<summary>
GraphQL请求地址
</summary>
<param name="query"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.ClaimService.GetUserId">
<summary>
获取当前请求登录ID
......
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
......@@ -104,7 +104,7 @@
<summary> </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.cust_script">
<summary> </summary>
<summary> 自定义导出 </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.ex_item">
<summary> </summary>
......@@ -157,6 +157,18 @@
<member name="P:Performance.EntityModels.PerformanceDbContext.mod_dic">
<summary> 部分公共数据抽取SQL </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.mod_extract">
<summary> 医院数据提取脚本 </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.mod_item">
<summary> </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.mod_module">
<summary> </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.mod_special">
<summary> </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.per_againallot">
<summary> </summary>
</member>
......@@ -202,6 +214,24 @@
<member name="P:Performance.EntityModels.PerformanceDbContext.rep_selection">
<summary> 条件表 </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.report_global">
<summary> </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.report_original_persontime">
<summary> 医院门诊住院人次 </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.report_original_stays">
<summary> 医院门诊住院人次 </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.report_original_surgery">
<summary> 医院手术人次 </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.report_original_workload">
<summary> </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.report_performance">
<summary> </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.res_account">
<summary> 科室核算结果 </summary>
</member>
......@@ -351,6 +381,11 @@
二次绩效ID
</summary>
</member>
<member name="P:Performance.EntityModels.ag_compute.UnitType">
<summary>
科室类型
</summary>
</member>
<member name="P:Performance.EntityModels.ag_compute.Department">
<summary>
科室
......@@ -376,6 +411,11 @@
可分配绩效
</summary>
</member>
<member name="P:Performance.EntityModels.ag_compute.PerforManagementFee">
<summary>
管理绩效
</summary>
</member>
<member name="P:Performance.EntityModels.ag_compute.OthePerfor">
<summary>
医院其他绩效
......@@ -383,7 +423,7 @@
</member>
<member name="P:Performance.EntityModels.ag_compute.NightWorkPerfor">
<summary>
实发绩效工资金额
夜班工作量绩效
</summary>
</member>
<member name="P:Performance.EntityModels.ag_compute.RealGiveFee">
......@@ -836,6 +876,26 @@
科室实发金额
</summary>
</member>
<member name="P:Performance.EntityModels.ag_secondallot.Efficiency">
<summary>
效率绩效
</summary>
</member>
<member name="P:Performance.EntityModels.ag_secondallot.Scale">
<summary>
规模绩效
</summary>
</member>
<member name="P:Performance.EntityModels.ag_secondallot.Grant">
<summary>
发放系数
</summary>
</member>
<member name="P:Performance.EntityModels.ag_secondallot.ShouldGiveFee">
<summary>
应发管理绩效
</summary>
</member>
<member name="P:Performance.EntityModels.ag_secondallot.Status">
<summary>
状态 1 未提交 2 等待审核 3 审核通过 4 驳回
......@@ -866,11 +926,6 @@
备注
</summary>
</member>
<member name="P:Performance.EntityModels.ag_secondallot.NursingDeptStatus">
<summary>
护理部审核状态 1 未提交 2 等待审核 3 审核通过 4 驳回
</summary>
</member>
<member name="P:Performance.EntityModels.ag_secondallot.NursingDeptAuditTime">
<summary>
护理部审核时间
......@@ -886,6 +941,11 @@
护理部备注
</summary>
</member>
<member name="P:Performance.EntityModels.ag_secondallot.NursingDeptStatus">
<summary>
护理部审核状态 2 等待审核 3 审核通过 4 驳回
</summary>
</member>
<member name="T:Performance.EntityModels.ag_temp">
<summary>
二次绩效模板
......@@ -1558,7 +1618,7 @@
</member>
<member name="T:Performance.EntityModels.collect_data">
<summary>
采集数据
</summary>
</member>
<member name="P:Performance.EntityModels.collect_data.ID">
......@@ -1578,7 +1638,7 @@
</member>
<member name="P:Performance.EntityModels.collect_data.UnitType">
<summary>
核算单元类别 1 医生组 2护理组 3医技组
</summary>
</member>
<member name="P:Performance.EntityModels.collect_data.RowNumber">
......@@ -1598,17 +1658,17 @@
</member>
<member name="P:Performance.EntityModels.collect_data.AccountingUnitTechnician">
<summary>
核算单元名称 医技
核算单元名称医技
</summary>
</member>
<member name="P:Performance.EntityModels.collect_data.AccountingUnitNurse">
<summary>
核算单元名称 护士
核算单元名称护士
</summary>
</member>
<member name="P:Performance.EntityModels.collect_data.AccountingUnitDoctor">
<summary>
核算单元名称 医生
核算单元名称医生
</summary>
</member>
<member name="P:Performance.EntityModels.collect_data.Department">
......@@ -1631,7 +1691,7 @@
</summary>
</member>
<member name="P:Performance.EntityModels.collect_permission.ID">
<member name="P:Performance.EntityModels.collect_permission.Id">
<summary>
</summary>
......@@ -1646,9 +1706,14 @@
</summary>
</member>
<member name="P:Performance.EntityModels.collect_permission.SheetType">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.collect_permission.SheetName">
<summary>
列头类型名称
</summary>
</member>
<member name="P:Performance.EntityModels.collect_permission.HeadName">
......@@ -1656,19 +1721,19 @@
列头名称
</summary>
</member>
<member name="P:Performance.EntityModels.collect_permission.Readnoly">
<member name="P:Performance.EntityModels.collect_permission.Visible">
<summary>
0 可读可写 1 只读
0 可见 1 只读
</summary>
</member>
<member name="P:Performance.EntityModels.collect_permission.AttachLast">
<member name="P:Performance.EntityModels.collect_permission.Readnoly">
<summary>
是否附带上次绩效 0 不附带 1 附带
0 可读可写 1 只读
</summary>
</member>
<member name="P:Performance.EntityModels.collect_permission.Visible">
<member name="P:Performance.EntityModels.collect_permission.AttachLast">
<summary>
0 可见 1 不可见
是否附带上次绩效 0 附带 1 不附带
</summary>
</member>
<member name="T:Performance.EntityModels.cust_script">
......@@ -1676,7 +1741,7 @@
自定义导出
</summary>
</member>
<member name="P:Performance.EntityModels.cust_script.ID">
<member name="P:Performance.EntityModels.cust_script.Id">
<summary>
</summary>
......@@ -1696,6 +1761,16 @@
是否允许二次分配下载 1 允许 2 禁止
</summary>
</member>
<member name="P:Performance.EntityModels.cust_script.Name">
<summary>
名称
</summary>
</member>
<member name="P:Performance.EntityModels.cust_script.Script">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.cust_script.ConfigId">
<summary>
配置Id
......@@ -2061,6 +2136,11 @@
核算单元（护理组）
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.Department">
<summary>
科室
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.IncludeAvgCalculate">
<summary>
是否带入平均计算 是 否
......@@ -2071,6 +2151,11 @@
定科人数
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.DoctorDirectorNumber">
<summary>
科主任数量
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.DoctorNumber">
<summary>
核算单元医生数量
......@@ -2081,6 +2166,11 @@
医生基础系数
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.DoctorSlopeFactor">
<summary>
倾斜系数
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.DoctorScale">
<summary>
规模绩效系数
......@@ -2116,6 +2206,11 @@
材料占比奖罚
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.DoctorExtra">
<summary>
医院奖罚
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.DoctorScoringAverage">
<summary>
考核对分率
......@@ -2136,6 +2231,71 @@
保底绩效系数
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.NurseHeadNumber">
<summary>
护士长人数
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.NurseNumber">
<summary>
护士人数
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.NurseBasicFactor">
<summary>
护理基础系数
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.NurseSlopeFactor">
<summary>
倾斜系数
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.NurseScale">
<summary>
规模绩效系数
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.NurseEffic">
<summary>
效率绩效系数
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.NurseGrant">
<summary>
发放系数
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.NurseOtherPerfor1">
<summary>
其他绩效1
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.NurseOtherPerfor2">
<summary>
其他绩效2
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.NurseExtra">
<summary>
医院奖罚
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.NurseScoringAverage">
<summary>
考核对分率
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.NurseAdjustFactor">
<summary>
调节系数
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.WorkSlopeFactor">
<summary>
工作量倾斜系数
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.UpdateDate">
<summary>
......@@ -2191,24 +2351,24 @@
行号
</summary>
</member>
<member name="P:Performance.EntityModels.im_data.AccountingUnit">
<member name="P:Performance.EntityModels.im_data.EmployeeName">
<summary>
核算单元名称
人员姓名
</summary>
</member>
<member name="P:Performance.EntityModels.im_data.Department">
<member name="P:Performance.EntityModels.im_data.JobNumber">
<summary>
科室名称
人员工号
</summary>
</member>
<member name="P:Performance.EntityModels.im_data.EmployeeName">
<member name="P:Performance.EntityModels.im_data.AccountingUnit">
<summary>
人员姓名
核算单元名称
</summary>
</member>
<member name="P:Performance.EntityModels.im_data.JobNumber">
<member name="P:Performance.EntityModels.im_data.Department">
<summary>
人员工号
科室名称
</summary>
</member>
<member name="P:Performance.EntityModels.im_data.TypeName">
......@@ -2371,6 +2531,21 @@
其他绩效
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee.OtherPerfor2">
<summary>
其他绩效2
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee.OtherPerfor3">
<summary>
其他绩效3
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee.OtherPerfor4">
<summary>
其他绩效4
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee.NightWorkPerfor">
<summary>
夜班费
......@@ -2476,21 +2651,11 @@
基础绩效系数
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.FitPeopleValue">
<summary>
实际人均绩效
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.PostCoefficient">
<summary>
岗位系数
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.PermanentStaff">
<summary>
效率绩效人数
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.Efficiency">
<summary>
效率绩效系数
......@@ -2506,11 +2671,6 @@
管理绩效发放系数
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.OtherManagePerfor">
<summary>
其他管理绩效
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.ScoreAverageRate">
<summary>
考核得分率
......@@ -2536,6 +2696,16 @@
其他绩效
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.OtherManagePerfor">
<summary>
其他管理绩效
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.NightWorkPerfor">
<summary>
夜班费
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.Punishment">
<summary>
医院奖罚
......@@ -2561,6 +2731,16 @@
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.PermanentStaff">
<summary>
效率绩效人数
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.FitPeopleValue">
<summary>
实际人均绩效
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.AssessBeforeOtherFee">
<summary>
考核前其他绩效
......@@ -2638,7 +2818,7 @@
</member>
<member name="P:Performance.EntityModels.im_employee_logistics.DoctorName">
<summary>
医生姓名
姓名
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_logistics.JobTitle">
......@@ -2961,6 +3141,201 @@
</summary>
</member>
<member name="T:Performance.EntityModels.mod_extract">
<summary>
医院数据提取脚本
</summary>
</member>
<member name="P:Performance.EntityModels.mod_extract.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_extract.HospitalId">
<summary>
医院ID
</summary>
</member>
<member name="P:Performance.EntityModels.mod_extract.EName">
<summary>
当前脚本提取内容名称
</summary>
</member>
<member name="P:Performance.EntityModels.mod_extract.ExecuteScript">
<summary>
执行脚本
</summary>
</member>
<member name="P:Performance.EntityModels.mod_extract.ExecuteType">
<summary>
当前脚本类型 1 收入整表 2 单项数据提取
</summary>
</member>
<member name="P:Performance.EntityModels.mod_extract.SourceType">
<summary>
数据库来源类型 1 标准库 2 绩效库
</summary>
</member>
<member name="P:Performance.EntityModels.mod_extract.Description">
<summary>
描述
</summary>
</member>
<member name="P:Performance.EntityModels.mod_extract.IsEnable">
<summary>
是否可用 1 可用 2 不可用
</summary>
</member>
<member name="T:Performance.EntityModels.mod_item">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.ModuleId">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.ItemName">
<summary>
绩效考核项
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.FactorValue1">
<summary>
默认系数或医生系数
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.FactorValue2">
<summary>
护理系数
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.FactorValue3">
<summary>
医技系数
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.ExtractId">
<summary>
抽取绩效值SQL
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.ConfigId">
<summary>
数据库地址
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.SelectionRange">
<summary>
用户选定抽取范围
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.ReadOnly">
<summary>
只读 0、否 1、是
</summary>
</member>
<member name="T:Performance.EntityModels.mod_module">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.HospitalId">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.SheetType">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.ModuleName">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.Description">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.ExtractId">
<summary>
提取脚本ID
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.ConfigId">
<summary>
数据库地址
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.ReadOnly">
<summary>
只读 0、否 1、是
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.IsGenerated">
<summary>
是否生成Item 0、否 1、是
</summary>
</member>
<member name="T:Performance.EntityModels.mod_special">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_special.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_special.HospitalId">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_special.Department">
<summary>
科室
</summary>
</member>
<member name="P:Performance.EntityModels.mod_special.Target">
<summary>
量化指标
</summary>
</member>
<member name="P:Performance.EntityModels.mod_special.TargetFactor">
<summary>
量化指标绩效分值
</summary>
</member>
<member name="P:Performance.EntityModels.mod_special.AdjustFactor">
<summary>
调节系数
</summary>
</member>
<member name="P:Performance.EntityModels.mod_special.ExtractId">
<summary>
抽取绩效值SQL
</summary>
</member>
<member name="P:Performance.EntityModels.mod_special.ConfigId">
<summary>
数据库地址
</summary>
</member>
<member name="T:Performance.EntityModels.per_againallot">
<summary>
......@@ -3156,11 +3531,6 @@
审核人
</summary>
</member>
<member name="P:Performance.EntityModels.per_apr_amount.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Performance.EntityModels.per_apr_amount.CreateDate">
<summary>
......@@ -3171,6 +3541,11 @@
</summary>
</member>
<member name="P:Performance.EntityModels.per_apr_amount.Remark">
<summary>
备注
</summary>
</member>
<member name="T:Performance.EntityModels.per_budget_amount">
<summary>
预算管理金额
......@@ -3821,12 +4196,42 @@
数据来源 1 excel 导入 2 计算
</summary>
</member>
<member name="T:Performance.EntityModels.report_original_persontime">
<member name="T:Performance.EntityModels.report_global">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.report_original_persontime.Id">
<member name="P:Performance.EntityModels.report_global.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.report_global.HospitalID">
<summary>
医院ID
</summary>
</member>
<member name="P:Performance.EntityModels.report_global.Category">
<summary>
类别
</summary>
</member>
<member name="P:Performance.EntityModels.report_global.Year">
<summary>
年份
</summary>
</member>
<member name="P:Performance.EntityModels.report_global.Value">
<summary>
值
</summary>
</member>
<member name="T:Performance.EntityModels.report_original_persontime">
<summary>
医院门诊住院人次
</summary>
</member>
<member name="P:Performance.EntityModels.report_original_persontime.ID">
<summary>
</summary>
......@@ -3873,10 +4278,10 @@
</member>
<member name="T:Performance.EntityModels.report_original_stays">
<summary>
医院门诊住院人次
</summary>
</member>
<member name="P:Performance.EntityModels.report_original_stays.Id">
<member name="P:Performance.EntityModels.report_original_stays.ID">
<summary>
</summary>
......@@ -3923,10 +4328,10 @@
</member>
<member name="T:Performance.EntityModels.report_original_surgery">
<summary>
医院手术人次
</summary>
</member>
<member name="P:Performance.EntityModels.report_original_surgery.Id">
<member name="P:Performance.EntityModels.report_original_surgery.ID">
<summary>
</summary>
......@@ -4036,6 +4441,76 @@
费用
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.HospitalId">
<summary>
医院Id
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.Year">
<summary>
年
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.Month">
<summary>
月
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.PersonnelName">
<summary>
人员信息
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.PersonnelNumber">
<summary>
人员工号
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.AccountingUnit">
<summary>
核算单元
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.Department">
<summary>
医院科室
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.Category">
<summary>
统计大分类
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.ItemName">
<summary>
统计小分类
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.CurrentValue">
<summary>
本期
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.LastIssueValue">
<summary>
上期
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.SamePeriodValue">
<summary>
同期
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.BudgetValue">
<summary>
预算
</summary>
</member>
<member name="T:Performance.EntityModels.rep_group">
<summary>
......@@ -4331,6 +4806,16 @@
是否带入平均计算 是 否
</summary>
</member>
<member name="P:Performance.EntityModels.res_account.PermanentStaff">
<summary>
定科人数
</summary>
</member>
<member name="P:Performance.EntityModels.res_account.ManagerNumber">
<summary>
科主任/护士长数量
</summary>
</member>
<member name="P:Performance.EntityModels.res_account.Number">
<summary>
核算单元医生数量
......@@ -4431,6 +4916,16 @@
实发绩效
</summary>
</member>
<member name="P:Performance.EntityModels.res_account.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Performance.EntityModels.res_account.ChangeLog">
<summary>
变更日志
</summary>
</member>
<member name="P:Performance.EntityModels.res_account.AssessBeforeOtherFee">
<summary>
考核前其他绩效
......@@ -4451,16 +4946,6 @@
考核后绩效
</summary>
</member>
<member name="P:Performance.EntityModels.res_account.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Performance.EntityModels.res_account.ChangeLog">
<summary>
变更日志
</summary>
</member>
<member name="T:Performance.EntityModels.res_accountdoctor">
<summary>
医生科室核算结果
......@@ -4758,12 +5243,12 @@
</member>
<member name="P:Performance.EntityModels.res_compute.FitPeopleValue">
<summary>
绩效基础核算参考值
</summary>
</member>
<member name="P:Performance.EntityModels.res_compute.FitPeopleRatio">
<summary>
绩效基数核算参考对象取值比例（如临床科室护士*95%）
</summary>
</member>
<member name="P:Performance.EntityModels.res_compute.EmployeeName">
......@@ -4841,6 +5326,26 @@
其他绩效(来自人员名单)
</summary>
</member>
<member name="P:Performance.EntityModels.res_compute.OtherPerfor2">
<summary>
其他绩效2(来自人员名单)
</summary>
</member>
<member name="P:Performance.EntityModels.res_compute.OtherPerfor3">
<summary>
其他绩效3(来自人员名单)
</summary>
</member>
<member name="P:Performance.EntityModels.res_compute.OtherPerfor4">
<summary>
其他绩效4(来自人员名单)
</summary>
</member>
<member name="P:Performance.EntityModels.res_compute.OtherManagePerfor">
<summary>
其他管理绩效(来自人员名单)
</summary>
</member>
<member name="P:Performance.EntityModels.res_compute.NightWorkPerfor">
<summary>
夜班费
......@@ -4901,11 +5406,6 @@
科主任/护士长人数
</summary>
</member>
<member name="P:Performance.EntityModels.res_compute.OtherManagePerfor">
<summary>
其他管理绩效
</summary>
</member>
<member name="P:Performance.EntityModels.res_compute.MedicalNumber">
<summary>
核算单元人员数量
......@@ -4951,6 +5451,11 @@
</summary>
</member>
<member name="P:Performance.EntityModels.res_reserved.UnitType">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.res_reserved.AccountingUnit">
<summary>
核算单元
......
performance/Performance.EntityModels/Context/PerformanceDbContext.cs
......@@ -110,8 +110,9 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
/// <summary> </summary>
public virtual DbSet<collect_permission> collect_permission { get; set; }
/// <summary> </summary>
/// <summary> 自定义导出 </summary>
public virtual DbSet<cust_script> cust_script { get; set; }
/// <summary> </summary>
public virtual DbSet<ex_item> ex_item { get; set; }
......@@ -163,14 +164,18 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
/// <summary> 部分公共数据抽取SQL </summary>
public virtual DbSet<mod_dic> mod_dic { get; set; }
///// <summary> 医院数据提取脚本 </summary>
// public virtual DbSet<mod_extract> mod_extract { get; set; }
///// <summary> </summary>
// public virtual DbSet<mod_item> mod_item { get; set; }
///// <summary> </summary>
// public virtual DbSet<mod_module> mod_module { get; set; }
///// <summary> </summary>
// public virtual DbSet<mod_special> mod_special { get; set; }
/// <summary> 医院数据提取脚本 </summary>
public virtual DbSet<mod_extract> mod_extract { get; set; }
/// <summary> </summary>
public virtual DbSet<mod_item> mod_item { get; set; }
/// <summary> </summary>
public virtual DbSet<mod_module> mod_module { get; set; }
/// <summary> </summary>
public virtual DbSet<mod_special> mod_special { get; set; }
/// <summary> </summary>
public virtual DbSet<per_againallot> per_againallot { get; set; }
......@@ -216,10 +221,24 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
/// <summary> 条件表 </summary>
public virtual DbSet<rep_selection> rep_selection { get; set; }
public virtual DbSet<report_original_surgery> report_original_surgery { get; set; }
public virtual DbSet<report_original_stays> report_original_stays { get; set; }
/// <summary> </summary>
public virtual DbSet<report_global> report_global { get; set; }
/// <summary> 医院门诊住院人次 </summary>
public virtual DbSet<report_original_persontime> report_original_persontime { get; set; }
/// <summary> 医院门诊住院人次 </summary>
public virtual DbSet<report_original_stays> report_original_stays { get; set; }
/// <summary> 医院手术人次 </summary>
public virtual DbSet<report_original_surgery> report_original_surgery { get; set; }
/// <summary> </summary>
public virtual DbSet<report_original_workload> report_original_workload { get; set; }
/// <summary> </summary>
public virtual DbSet<report_performance> report_performance { get; set; }
/// <summary> 科室核算结果 </summary>
public virtual DbSet<res_account> res_account { get; set; }
......
performance/Performance.EntityModels/Entity/ag_compute.cs
......@@ -30,6 +30,10 @@ public class ag_compute
/// 二次绩效ID
/// </summary>
public Nullable<int> SecondId { get; set; }
/// <summary>
/// 科室类型
/// </summary>
public string UnitType { get; set; }
/// <summary>
......@@ -58,12 +62,17 @@ public class ag_compute
public Nullable<decimal> PerforSumFee { get; set; }
/// <summary>
/// 管理绩效
/// </summary>
public Nullable<decimal> PerforManagementFee { get; set; }
/// <summary>
/// 医院其他绩效
/// </summary>
public Nullable<decimal> OthePerfor { get; set; }
/// <summary>
/// 实发绩效工资金额
/// 夜班工作量绩效
/// </summary>
public Nullable<decimal> NightWorkPerfor { get; set; }
......
performance/Performance.EntityModels/Entity/ag_secondallot.cs
......@@ -57,6 +57,26 @@ public class ag_secondallot
public Nullable<decimal> RealGiveFee { get; set; }
/// <summary>
/// 效率绩效
/// </summary>
public Nullable<decimal> Efficiency { get; set; }
/// <summary>
/// 规模绩效
/// </summary>
public Nullable<decimal> Scale { get; set; }
/// <summary>
/// 发放系数
/// </summary>
public Nullable<decimal> Grant { get; set; }
/// <summary>
/// 应发管理绩效
/// </summary>
public Nullable<decimal> ShouldGiveFee { get; set; }
/// <summary>
/// 状态 1 未提交 2 等待审核 3 审核通过 4 驳回
/// </summary>
public Nullable<int> Status { get; set; }
......@@ -87,11 +107,6 @@ public class ag_secondallot
public string Remark { get; set; }
/// <summary>
/// 护理部审核状态 1 未提交 2 等待审核 3 审核通过 4 驳回
/// </summary>
public Nullable<int> NursingDeptStatus { get; set; }
/// <summary>
/// 护理部审核时间
/// </summary>
public Nullable<DateTime> NursingDeptAuditTime { get; set; }
......@@ -105,5 +120,10 @@ public class ag_secondallot
/// 护理部备注
/// </summary>
public string NursingDeptRemark { get; set; }
/// <summary>
/// 护理部审核状态 2 等待审核 3 审核通过 4 驳回
/// </summary>
public Nullable<int> NursingDeptStatus { get; set; }
}
}
performance/Performance.EntityModels/Entity/collect_data.cs
//-----------------------------------------------------------------------
// <copyright file=" ag_data.cs">
// * FileName: 二次分配不固定数据.cs
// <copyright file=" collect_data.cs">
// * FileName: .cs
// </copyright>
//-----------------------------------------------------------------------
using System;
......@@ -10,7 +10,7 @@
namespace Performance.EntityModels
{
/// <summary>
/// 采集数据
///
/// </summary>
[Table("collect_data")]
public class collect_data
......@@ -32,7 +32,7 @@ public class collect_data
public string SheetName { get; set; }
/// <summary>
///
/// 核算单元类别 1 医生组 2护理组 3医技组
/// </summary>
public string UnitType { get; set; }
......@@ -45,30 +45,37 @@ public class collect_data
/// 人员姓名
/// </summary>
public string EmployeeName { get; set; }
/// <summary>
/// 人员工号
/// </summary>
public string JobNumber { get; set; }
/// <summary>
/// 核算单元名称 医技
/// 核算单元名称医技
/// </summary>
public string AccountingUnitTechnician { get; set; }
/// <summary>
/// 核算单元名称 护士
/// 核算单元名称护士
/// </summary>
public string AccountingUnitNurse { get; set; }
/// <summary>
/// 核算单元名称 医生
/// 核算单元名称医生
/// </summary>
public string AccountingUnitDoctor { get; set; }
/// <summary>
/// 科室名称
/// </summary>
public string Department { get; set; }
/// <summary>
/// 列头类型名称
/// </summary>
public string TypeName { get; set; }
/// <summary>
/// 单元格value
/// </summary>
......
performance/Performance.EntityModels/Entity/collect_permission.cs
//-----------------------------------------------------------------------
// <copyright file=" ag_data.cs">
// * FileName: 二次分配不固定数据.cs
// <copyright file=" collect_permission.cs">
// * FileName: .cs
// </copyright>
//-----------------------------------------------------------------------
using System;
......@@ -19,7 +19,7 @@ public class collect_permission
///
/// </summary>
[Key]
public int ID { get; set; }
public int Id { get; set; }
/// <summary>
///
......@@ -32,7 +32,12 @@ public class collect_permission
public int UserId { get; set; }
/// <summary>
/// 列头类型名称
///
/// </summary>
public int SheetType { get; set; }
/// <summary>
///
/// </summary>
public string SheetName { get; set; }
......@@ -42,18 +47,18 @@ public class collect_permission
public string HeadName { get; set; }
/// <summary>
/// 0 可读可写 1 只读
/// 0 可见 1 只读
/// </summary>
public int? Readnoly { get; set; }
public int Visible { get; set; }
/// <summary>
/// 是否附带上次绩效 0 不附带 1 附带
/// 0 可读可写 1 只读
/// </summary>
public int AttachLast { get; set; }
public int SheetType { get; set; }
public int Readnoly { get; set; }
/// <summary>
/// 0 可见 1 不可见
/// 是否附带上次绩效 0 附带 1 不附带
/// </summary>
public int Visible { get; set; }
public int AttachLast { get; set; }
}
}
performance/Performance.EntityModels/Entity/cust_script.cs
//-----------------------------------------------------------------------
// <copyright file="cust_script.cs">
// * FileName: cust_script.cs
// <copyright file=" cust_script.cs">
// * FileName: 自定义导出.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
......@@ -19,26 +19,38 @@ public class cust_script
///
/// </summary>
[Key]
public int ID { get; set; }
public int Id { get; set; }
/// <summary>
/// 医院ID
/// </summary>
public int HospitalId { get; set; }
/// <summary>
/// 是否允许一次分配下载 1 允许 2 禁止
/// </summary>
public int IsOnceAllot { get; set; }
/// <summary>
/// 是否允许二次分配下载 1 允许 2 禁止
/// </summary>
public int IsSecondAllot { get; set; }
/// <summary>
/// 名称
/// </summary>
public string Name { get; set; }
/// <summary>
///
/// </summary>
public string Script { get; set; }
/// <summary>
/// 配置Id
/// </summary>
public int ConfigId { get; set; }
/// <summary>
/// 是否可用 1 可用 2 不可用
/// </summary>
......
performance/Performance.EntityModels/Entity/im_accountbasic.cs
......@@ -46,10 +46,10 @@ public class im_accountbasic
/// </summary>
public string NurseAccountingUnit { get; set; }
///// <summary>
///// 科室
///// </summary>
//public string Department { get; set; }
/// <summary>
/// 科室
/// </summary>
public string Department { get; set; }
/// <summary>
/// 是否带入平均计算 是 否
......@@ -61,10 +61,10 @@ public class im_accountbasic
/// </summary>
public Nullable<decimal> PermanentStaff { get; set; }
///// <summary>
///// 科主任数量
///// </summary>
//public Nullable<decimal> DoctorDirectorNumber { get; set; }
/// <summary>
/// 科主任数量
/// </summary>
public Nullable<decimal> DoctorDirectorNumber { get; set; }
/// <summary>
/// 核算单元医生数量
......@@ -76,10 +76,10 @@ public class im_accountbasic
/// </summary>
public Nullable<decimal> DoctorBasicFactor { get; set; }
///// <summary>
///// 倾斜系数
///// </summary>
//public Nullable<decimal> DoctorSlopeFactor { get; set; }
/// <summary>
/// 倾斜系数
/// </summary>
public Nullable<decimal> DoctorSlopeFactor { get; set; }
/// <summary>
/// 规模绩效系数
......@@ -116,10 +116,10 @@ public class im_accountbasic
/// </summary>
public Nullable<decimal> MaterialsExtra { get; set; }
///// <summary>
///// 医院奖罚
///// </summary>
//public Nullable<decimal> DoctorExtra { get; set; }
/// <summary>
/// 医院奖罚
/// </summary>
public Nullable<decimal> DoctorExtra { get; set; }
/// <summary>
/// 考核对分率
......@@ -141,70 +141,70 @@ public class im_accountbasic
/// </summary>
public Nullable<decimal> MinimumFactor { get; set; }
///// <summary>
///// 护士长人数
///// </summary>
//public Nullable<decimal> NurseHeadNumber { get; set; }
///// <summary>
///// 护士人数
///// </summary>
//public Nullable<decimal> NurseNumber { get; set; }
///// <summary>
///// 护理基础系数
///// </summary>
//public Nullable<decimal> NurseBasicFactor { get; set; }
///// <summary>
///// 倾斜系数
///// </summary>
//public Nullable<decimal> NurseSlopeFactor { get; set; }
///// <summary>
///// 规模绩效系数
///// </summary>
//public Nullable<decimal> NurseScale { get; set; }
///// <summary>
///// 效率绩效系数
///// </summary>
//public Nullable<decimal> NurseEffic { get; set; }
///// <summary>
///// 发放系数
///// </summary>
//public Nullable<decimal> NurseGrant { get; set; }
///// <summary>
///// 其他绩效1
///// </summary>
//public Nullable<decimal> NurseOtherPerfor1 { get; set; }
///// <summary>
///// 其他绩效2
///// </summary>
//public Nullable<decimal> NurseOtherPerfor2 { get; set; }
///// <summary>
///// 医院奖罚
///// </summary>
//public Nullable<decimal> NurseExtra { get; set; }
///// <summary>
///// 考核对分率
///// </summary>
//public Nullable<decimal> NurseScoringAverage { get; set; }
///// <summary>
///// 调节系数
///// </summary>
//public Nullable<decimal> NurseAdjustFactor { get; set; }
///// <summary>
///// 工作量倾斜系数
///// </summary>
//public Nullable<decimal> WorkSlopeFactor { get; set; }
/// <summary>
/// 护士长人数
/// </summary>
public Nullable<decimal> NurseHeadNumber { get; set; }
/// <summary>
/// 护士人数
/// </summary>
public Nullable<decimal> NurseNumber { get; set; }
/// <summary>
/// 护理基础系数
/// </summary>
public Nullable<decimal> NurseBasicFactor { get; set; }
/// <summary>
/// 倾斜系数
/// </summary>
public Nullable<decimal> NurseSlopeFactor { get; set; }
/// <summary>
/// 规模绩效系数
/// </summary>
public Nullable<decimal> NurseScale { get; set; }
/// <summary>
/// 效率绩效系数
/// </summary>
public Nullable<decimal> NurseEffic { get; set; }
/// <summary>
/// 发放系数
/// </summary>
public Nullable<decimal> NurseGrant { get; set; }
/// <summary>
/// 其他绩效1
/// </summary>
public Nullable<decimal> NurseOtherPerfor1 { get; set; }
/// <summary>
/// 其他绩效2
/// </summary>
public Nullable<decimal> NurseOtherPerfor2 { get; set; }
/// <summary>
/// 医院奖罚
/// </summary>
public Nullable<decimal> NurseExtra { get; set; }
/// <summary>
/// 考核对分率
/// </summary>
public Nullable<decimal> NurseScoringAverage { get; set; }
/// <summary>
/// 调节系数
/// </summary>
public Nullable<decimal> NurseAdjustFactor { get; set; }
/// <summary>
/// 工作量倾斜系数
/// </summary>
public Nullable<decimal> WorkSlopeFactor { get; set; }
/// <summary>
///
......@@ -220,10 +220,12 @@ public class im_accountbasic
/// 考核前其他绩效
/// </summary>
public Nullable<decimal> AssessBeforeOtherFee { get; set; }
/// <summary>
/// 考核后其他绩效
/// </summary>
public Nullable<decimal> AssessLaterOtherFee { get; set; }
/// <summary>
/// 调节后其他绩效
/// </summary>
......
performance/Performance.EntityModels/Entity/im_data.cs
......@@ -42,23 +42,24 @@ public class im_data
public Nullable<int> RowNumber { get; set; }
/// <summary>
/// 核算单元名称
/// 人员姓名
/// </summary>
public string AccountingUnit { get; set; }
public string EmployeeName { get; set; }
/// <summary>
/// 科室名称
/// 人员工号
/// </summary>
public string Department { get; set; }
public string JobNumber { get; set; }
/// <summary>
/// 人员姓名
/// 核算单元名称
/// </summary>
public string EmployeeName { get; set; }
public string AccountingUnit { get; set; }
/// <summary>
/// 人员工号
/// 科室名称
/// </summary>
public string JobNumber { get; set; }
public string Department { get; set; }
/// <summary>
/// 列头类型名称
......
performance/Performance.EntityModels/Entity/im_employee.cs
......@@ -117,6 +117,21 @@ public class im_employee
public Nullable<decimal> OtherPerfor { get; set; }
/// <summary>
/// 其他绩效2
/// </summary>
public Nullable<decimal> OtherPerfor2 { get; set; }
/// <summary>
/// 其他绩效3
/// </summary>
public Nullable<decimal> OtherPerfor3 { get; set; }
/// <summary>
/// 其他绩效4
/// </summary>
public Nullable<decimal> OtherPerfor4 { get; set; }
/// <summary>
/// 夜班费
/// </summary>
public Nullable<decimal> NightWorkPerfor { get; set; }
......@@ -145,14 +160,17 @@ public class im_employee
///
/// </summary>
public Nullable<int> UpdateUser { get; set; }
/// <summary>
/// 考核前其他绩效
/// </summary>
public Nullable<decimal> AssessBeforeOtherFee { get; set; }
/// <summary>
/// 考核后其他绩效
/// </summary>
public Nullable<decimal> AssessLaterOtherFee { get; set; }
/// <summary>
/// 调节后其他绩效
/// </summary>
......
performance/Performance.EntityModels/Entity/im_employee_clinic.cs
......@@ -72,21 +72,11 @@ public class im_employee_clinic
public Nullable<decimal> Basics { get; set; }
/// <summary>
/// 实际人均绩效
/// </summary>
public Nullable<decimal> FitPeopleValue { get; set; }
/// <summary>
/// 岗位系数
/// </summary>
public Nullable<decimal> PostCoefficient { get; set; }
/// <summary>
/// 效率绩效人数
/// </summary>
public Nullable<decimal> PermanentStaff { get; set; }
/// <summary>
/// 效率绩效系数
/// </summary>
public Nullable<decimal> Efficiency { get; set; }
......@@ -102,11 +92,6 @@ public class im_employee_clinic
public Nullable<decimal> Management { get; set; }
/// <summary>
/// 其他管理绩效
/// </summary>
public Nullable<decimal> OtherManagePerfor { get; set; }
/// <summary>
/// 考核得分率
/// </summary>
public Nullable<decimal> ScoreAverageRate { get; set; }
......@@ -132,6 +117,16 @@ public class im_employee_clinic
public Nullable<decimal> OtherPerfor { get; set; }
/// <summary>
/// 其他管理绩效
/// </summary>
public Nullable<decimal> OtherManagePerfor { get; set; }
/// <summary>
/// 夜班费
/// </summary>
public Nullable<decimal> NightWorkPerfor { get; set; }
/// <summary>
/// 医院奖罚
/// </summary>
public Nullable<decimal> Punishment { get; set; }
......@@ -155,14 +150,27 @@ public class im_employee_clinic
///
/// </summary>
public Nullable<int> UpdateUser { get; set; }
/// <summary>
/// 效率绩效人数
/// </summary>
public Nullable<decimal> PermanentStaff { get; set; }
/// <summary>
/// 实际人均绩效
/// </summary>
public Nullable<decimal> FitPeopleValue { get; set; }
/// <summary>
/// 考核前其他绩效
/// </summary>
public Nullable<decimal> AssessBeforeOtherFee { get; set; }
/// <summary>
/// 考核后其他绩效
/// </summary>
public Nullable<decimal> AssessLaterOtherFee { get; set; }
/// <summary>
/// 调节后其他绩效
/// </summary>
......
performance/Performance.EntityModels/Entity/im_employee_logistics.cs
//-----------------------------------------------------------------------
// <copyright file=" im_employee_clinic.cs">
// <copyright file=" im_employee_logistics.cs">
// * FileName: .cs
// </copyright>
//-----------------------------------------------------------------------
......@@ -72,7 +72,7 @@ public class im_employee_logistics
public string PersonnelNumber { get; set; }
/// <summary>
/// 医生姓名
/// 姓名
/// </summary>
public string DoctorName { get; set; }
......@@ -86,11 +86,6 @@ public class im_employee_logistics
/// </summary>
public Nullable<decimal> PostCoefficient { get; set; }
///// <summary>
///// 参加工作时间
///// </summary>
//public Nullable<DateTime> WorkTime { get; set; }
/// <summary>
/// 考核得分率
/// </summary>
......@@ -101,36 +96,11 @@ public class im_employee_logistics
/// </summary>
public Nullable<decimal> Attendance { get; set; }
///// <summary>
///// 核算单元医生数
///// </summary>
//public Nullable<int> PeopleNumber { get; set; }
///// <summary>
///// 工作量绩效
///// </summary>
//public Nullable<decimal> Workload { get; set; }
/// <summary>
/// 其他绩效
/// </summary>
public Nullable<decimal> OtherPerfor { get; set; }
///// <summary>
///// 医院奖罚
///// </summary>
//public Nullable<decimal> Punishment { get; set; }
///// <summary>
///// 调节系数
///// </summary>
//public Nullable<decimal> Adjust { get; set; }
///// <summary>
///// 发放系数
///// </summary>
//public Nullable<decimal> Grant { get; set; }
/// <summary>
///
/// </summary>
......@@ -145,10 +115,12 @@ public class im_employee_logistics
/// 考核前其他绩效
/// </summary>
public Nullable<decimal> AssessBeforeOtherFee { get; set; }
/// <summary>
/// 考核后其他绩效
/// </summary>
public Nullable<decimal> AssessLaterOtherFee { get; set; }
/// <summary>
/// 调节后其他绩效
/// </summary>
......
performance/Performance.EntityModels/Entity/mod_extract.cs
////-----------------------------------------------------------------------
//// <copyright file=" mod_extract.cs">
//// * FileName: 医院数据提取脚本.cs
//// </copyright>
////-----------------------------------------------------------------------
//using System;
//using System.ComponentModel.DataAnnotations;
//using System.ComponentModel.DataAnnotations.Schema;
//namespace Performance.EntityModels
//{
// /// <summary>
// /// 医院数据提取脚本
// /// </summary>
// [Table("mod_extract")]
// public class mod_extract
// {
// /// <summary>
// ///
// /// </summary>
// [Key]
// public int Id { get; set; }
// /// <summary>
// /// 医院ID
// /// </summary>
// public Nullable<int> HospitalId { get; set; }
// /// <summary>
// /// 当前脚本提取内容名称
// /// </summary>
// public string EName { get; set; }
// /// <summary>
// /// 执行脚本
// /// </summary>
// public string ExecuteScript { get; set; }
// /// <summary>
// /// 当前脚本类型 1 收入整表 2 单项数据提取
// /// </summary>
// public Nullable<int> ExecuteType { get; set; }
// /// <summary>
// /// 数据库来源类型 1 标准库 2 绩效库
// /// </summary>
// public Nullable<int> SourceType { get; set; }
// /// <summary>
// /// 描述
// /// </summary>
// public string Description { get; set; }
// /// <summary>
// /// 是否可用 1 可用 2 不可用
// /// </summary>
// public Nullable<int> IsEnable { get; set; }
// }
//}
//-----------------------------------------------------------------------
// <copyright file=" mod_extract.cs">
// * FileName: 医院数据提取脚本.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels
{
/// <summary>
/// 医院数据提取脚本
/// </summary>
[Table("mod_extract")]
public class mod_extract
{
/// <summary>
///
/// </summary>
[Key]
public int Id { get; set; }
/// <summary>
/// 医院ID
/// </summary>
public Nullable<int> HospitalId { get; set; }
/// <summary>
/// 当前脚本提取内容名称
/// </summary>
public string EName { get; set; }
/// <summary>
/// 执行脚本
/// </summary>
public string ExecuteScript { get; set; }
/// <summary>
/// 当前脚本类型 1 收入整表 2 单项数据提取
/// </summary>
public Nullable<int> ExecuteType { get; set; }
/// <summary>
/// 数据库来源类型 1 标准库 2 绩效库
/// </summary>
public Nullable<int> SourceType { get; set; }
/// <summary>
/// 描述
/// </summary>
public string Description { get; set; }
/// <summary>
/// 是否可用 1 可用 2 不可用
/// </summary>
public Nullable<int> IsEnable { get; set; }
}
}
performance/Performance.EntityModels/Entity/mod_item.cs
////-----------------------------------------------------------------------
//// <copyright file=" mod_item.cs">
//// * FileName: .cs
//// </copyright>
////-----------------------------------------------------------------------
//using System;
//using System.ComponentModel.DataAnnotations;
//using System.ComponentModel.DataAnnotations.Schema;
//-----------------------------------------------------------------------
// <copyright file=" mod_item.cs">
// * FileName: .cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
//namespace Performance.EntityModels
//{
// /// <summary>
// ///
// /// </summary>
// [Table("mod_item")]
// public class mod_item
// {
// /// <summary>
// ///
// /// </summary>
// [Key]
// public int Id { get; set; }
namespace Performance.EntityModels
{
/// <summary>
///
/// </summary>
[Table("mod_item")]
public class mod_item
{
/// <summary>
///
/// </summary>
[Key]
public int Id { get; set; }
// /// <summary>
// ///
// /// </summary>
// public Nullable<int> ModuleId { get; set; }
/// <summary>
///
/// </summary>
public Nullable<int> ModuleId { get; set; }
// /// <summary>
// /// 绩效考核项
// /// </summary>
// public string ItemName { get; set; }
/// <summary>
/// 绩效考核项
/// </summary>
public string ItemName { get; set; }
// /// <summary>
// /// 默认系数或医生系数
// /// </summary>
// public Nullable<decimal> FactorValue1 { get; set; }
/// <summary>
/// 默认系数或医生系数
/// </summary>
public Nullable<decimal> FactorValue1 { get; set; }
// /// <summary>
// /// 护理系数
// /// </summary>
// public Nullable<decimal> FactorValue2 { get; set; }
/// <summary>
/// 护理系数
/// </summary>
public Nullable<decimal> FactorValue2 { get; set; }
// /// <summary>
// /// 医技系数
// /// </summary>
// public Nullable<decimal> FactorValue3 { get; set; }
/// <summary>
/// 医技系数
/// </summary>
public Nullable<decimal> FactorValue3 { get; set; }
// /// <summary>
// /// 抽取绩效值SQL
// /// </summary>
// public Nullable<int> ExtractId { get; set; }
/// <summary>
/// 抽取绩效值SQL
/// </summary>
public Nullable<int> ExtractId { get; set; }
// /// <summary>
// /// 数据库地址
// /// </summary>
// public Nullable<int> ConfigId { get; set; }
/// <summary>
/// 数据库地址
/// </summary>
public Nullable<int> ConfigId { get; set; }
// /// <summary>
// /// 用户选定抽取范围
// /// </summary>
// public string SelectionRange { get; set; }
/// <summary>
/// 用户选定抽取范围
/// </summary>
public string SelectionRange { get; set; }
// /// <summary>
// /// 只读 0、否 1、是
// /// </summary>
// public Nullable<int> ReadOnly { get; set; }
// }
//}
/// <summary>
/// 只读 0、否 1、是
/// </summary>
public Nullable<int> ReadOnly { get; set; }
}
}
performance/Performance.EntityModels/Entity/mod_module.cs
////-----------------------------------------------------------------------
//// <copyright file=" mod_module.cs">
//// * FileName: .cs
//// </copyright>
////-----------------------------------------------------------------------
//using System;
//using System.ComponentModel.DataAnnotations;
//using System.ComponentModel.DataAnnotations.Schema;
//-----------------------------------------------------------------------
// <copyright file=" mod_module.cs">
// * FileName: .cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
//namespace Performance.EntityModels
//{
// /// <summary>
// ///
// /// </summary>
// [Table("mod_module")]
// public class mod_module
// {
// /// <summary>
// ///
// /// </summary>
// [Key]
// public int Id { get; set; }
namespace Performance.EntityModels
{
/// <summary>
///
/// </summary>
[Table("mod_module")]
public class mod_module
{
/// <summary>
///
/// </summary>
[Key]
public int Id { get; set; }
// /// <summary>
// ///
// /// </summary>
// public Nullable<int> HospitalId { get; set; }
/// <summary>
///
/// </summary>
public Nullable<int> HospitalId { get; set; }
// /// <summary>
// ///
// /// </summary>
// public Nullable<int> SheetType { get; set; }
/// <summary>
///
/// </summary>
public Nullable<int> SheetType { get; set; }
// /// <summary>
// ///
// /// </summary>
// public string ModuleName { get; set; }
/// <summary>
///
/// </summary>
public string ModuleName { get; set; }
// /// <summary>
// ///
// /// </summary>
// public string Description { get; set; }
/// <summary>
///
/// </summary>
public string Description { get; set; }
// /// <summary>
// /// 提取脚本ID
// /// </summary>
// public Nullable<int> ExtractId { get; set; }
/// <summary>
/// 提取脚本ID
/// </summary>
public Nullable<int> ExtractId { get; set; }
// /// <summary>
// /// 数据库地址
// /// </summary>
// public Nullable<int> ConfigId { get; set; }
/// <summary>
/// 数据库地址
/// </summary>
public Nullable<int> ConfigId { get; set; }
// /// <summary>
// /// 只读 0、否 1、是
// /// </summary>
// public Nullable<int> ReadOnly { get; set; }
/// <summary>
/// 只读 0、否 1、是
/// </summary>
public Nullable<int> ReadOnly { get; set; }
// /// <summary>
// /// 是否生成Item 0、否 1、是
// /// </summary>
// public Nullable<int> IsGenerated { get; set; }
// }
//}
/// <summary>
/// 是否生成Item 0、否 1、是
/// </summary>
public Nullable<int> IsGenerated { get; set; }
}
}
performance/Performance.EntityModels/Entity/mod_special.cs
////-----------------------------------------------------------------------
//// <copyright file=" mod_special.cs">
//// * FileName: .cs
//// </copyright>
////-----------------------------------------------------------------------
//using System;
//using System.ComponentModel.DataAnnotations;
//using System.ComponentModel.DataAnnotations.Schema;
//namespace Performance.EntityModels
//{
// /// <summary>
// ///
// /// </summary>
// [Table("mod_special")]
// public class mod_special
// {
// /// <summary>
// ///
// /// </summary>
// [Key]
// public int Id { get; set; }
// /// <summary>
// ///
// /// </summary>
// public Nullable<int> HospitalId { get; set; }
// /// <summary>
// /// 科室
// /// </summary>
// public string Department { get; set; }
// /// <summary>
// /// 量化指标
// /// </summary>
// public string Target { get; set; }
// /// <summary>
// /// 量化指标绩效分值
// /// </summary>
// public Nullable<decimal> TargetFactor { get; set; }
// /// <summary>
// /// 调节系数
// /// </summary>
// public Nullable<decimal> AdjustFactor { get; set; }
// /// <summary>
// /// 抽取绩效值SQL
// /// </summary>
// public Nullable<int> ExtractId { get; set; }
// /// <summary>
// /// 数据库地址
// /// </summary>
// public Nullable<int> ConfigId { get; set; }
// }
//}
//-----------------------------------------------------------------------
// <copyright file=" mod_special.cs">
// * FileName: .cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels
{
/// <summary>
///
/// </summary>
[Table("mod_special")]
public class mod_special
{
/// <summary>
///
/// </summary>
[Key]
public int Id { get; set; }
/// <summary>
///
/// </summary>
public Nullable<int> HospitalId { get; set; }
/// <summary>
/// 科室
/// </summary>
public string Department { get; set; }
/// <summary>
/// 量化指标
/// </summary>
public string Target { get; set; }
/// <summary>
/// 量化指标绩效分值
/// </summary>
public Nullable<decimal> TargetFactor { get; set; }
/// <summary>
/// 调节系数
/// </summary>
public Nullable<decimal> AdjustFactor { get; set; }
/// <summary>
/// 抽取绩效值SQL
/// </summary>
public Nullable<int> ExtractId { get; set; }
/// <summary>
/// 数据库地址
/// </summary>
public Nullable<int> ConfigId { get; set; }
}
}
performance/Performance.EntityModels/Entity/per_apr_amount.cs
......@@ -59,7 +59,7 @@ public class per_apr_amount
/// <summary>
/// 状态 1 未提交 2 等待审核 3 审核通过 4 驳回
/// </summary>
public int Status { get; set; }
public Nullable<int> Status { get; set; }
/// <summary>
/// 审核时间
......@@ -72,11 +72,6 @@ public class per_apr_amount
public Nullable<int> AuditUser { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
///
/// </summary>
public Nullable<DateTime> CreateDate { get; set; }
......@@ -85,5 +80,10 @@ public class per_apr_amount
///
/// </summary>
public Nullable<int> CreateUser { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
}
performance/Performance.EntityModels/Entity/report_global.cs 0 → 100644
//-----------------------------------------------------------------------
// <copyright file=" report_global.cs">
// * FileName: .cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels
{
/// <summary>
///
/// </summary>
[Table("report_global")]
public class report_global
{
/// <summary>
///
/// </summary>
[Key]
public int Id { get; set; }
/// <summary>
/// 医院ID
/// </summary>
public int HospitalID { get; set; }
/// <summary>
/// 类别
/// </summary>
public string Category { get; set; }
/// <summary>
/// 年份
/// </summary>
public Nullable<int> Year { get; set; }
/// <summary>
/// 值
/// </summary>
public Nullable<decimal> Value { get; set; }
}
}
performance/Performance.EntityModels/Entity/report_original_persontime.cs
//-----------------------------------------------------------------------
// <copyright file=" report_original_workload.cs">
// * FileName: .cs
//-----------------------------------------------------------------------
// <copyright file=" report_original_persontime.cs">
// * FileName: 医院门诊住院人次.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
......@@ -10,7 +10,7 @@
namespace Performance.EntityModels
{
/// <summary>
///
/// 医院门诊住院人次
/// </summary>
[Table("report_original_persontime")]
public class report_original_persontime
......@@ -19,7 +19,7 @@ public class report_original_persontime
///
/// </summary>
[Key]
public int Id { get; set; }
public int ID { get; set; }
/// <summary>
///
......
performance/Performance.EntityModels/Entity/report_original_stays.cs
//-----------------------------------------------------------------------
// <copyright file=" report_original_workload.cs">
// * FileName: .cs
//-----------------------------------------------------------------------
// <copyright file=" report_original_stays.cs">
// * FileName: 医院门诊住院人次.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
......@@ -10,7 +10,7 @@
namespace Performance.EntityModels
{
/// <summary>
///
/// 医院门诊住院人次
/// </summary>
[Table("report_original_stays")]
public class report_original_stays
......@@ -19,7 +19,7 @@ public class report_original_stays
///
/// </summary>
[Key]
public int Id { get; set; }
public int ID { get; set; }
/// <summary>
///
......
performance/Performance.EntityModels/Entity/report_original_surgery.cs
//-----------------------------------------------------------------------
// <copyright file=" report_original_workload.cs">
// * FileName: .cs
//-----------------------------------------------------------------------
// <copyright file=" report_original_surgery.cs">
// * FileName: 医院手术人次.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
......@@ -10,7 +10,7 @@
namespace Performance.EntityModels
{
/// <summary>
///
/// 医院手术人次
/// </summary>
[Table("report_original_surgery")]
public class report_original_surgery
......@@ -19,7 +19,7 @@ public class report_original_surgery
///
/// </summary>
[Key]
public int Id { get; set; }
public int ID { get; set; }
/// <summary>
///
......
performance/Performance.EntityModels/Entity/report_performance.cs 0 → 100644
//-----------------------------------------------------------------------
// <copyright file=" report_performance.cs">
// * FileName: .cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels
{
[Table("report_performance")]
public class report_performance
{
/// <summary>
///
/// </summary>
[Key]
public int Id { get; set; }
/// <summary>
/// 医院Id
/// </summary>
public int HospitalId { get; set; }
/// <summary>
/// 年
/// </summary>
public int Year { get; set; }
/// <summary>
/// 月
/// </summary>
public int Month { get; set; }
/// <summary>
/// 人员信息
/// </summary>
public string PersonnelName { get; set; }
/// <summary>
/// 人员工号
/// </summary>
public string PersonnelNumber { get; set; }
/// <summary>
/// 核算单元
/// </summary>
public string AccountingUnit { get; set; }
/// <summary>
/// 医院科室
/// </summary>
public string Department { get; set; }
/// <summary>
/// 统计大分类
/// </summary>
public string Category { get; set; }
/// <summary>
/// 统计小分类
/// </summary>
public string ItemName { get; set; }
/// <summary>
/// 本期
/// </summary>
public decimal CurrentValue { get; set; }
/// <summary>
/// 上期
/// </summary>
public decimal LastIssueValue { get; set; }
/// <summary>
/// 同期
/// </summary>
public decimal SamePeriodValue { get; set; }
/// <summary>
/// 预算
/// </summary>
public decimal BudgetValue { get; set; }
}
}
performance/Performance.EntityModels/Entity/res_account.cs
......@@ -51,15 +51,15 @@ public class res_account
/// </summary>
public string IncludeAvgCalculate { get; set; }
///// <summary>
///// 定科人数
///// </summary>
//public Nullable<decimal> PermanentStaff { get; set; }
/// <summary>
/// 定科人数
/// </summary>
public Nullable<decimal> PermanentStaff { get; set; }
///// <summary>
///// 科主任/护士长数量
///// </summary>
//public Nullable<decimal> ManagerNumber { get; set; }
/// <summary>
/// 科主任/护士长数量
/// </summary>
public Nullable<decimal> ManagerNumber { get; set; }
/// <summary>
/// 核算单元医生数量
......@@ -162,30 +162,33 @@ public class res_account
public Nullable<decimal> RealGiveFee { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 变更日志
/// </summary>
public string ChangeLog { get; set; }
/// <summary>
/// 考核前其他绩效
/// </summary>
public Nullable<decimal> AssessBeforeOtherFee { get; set; }
/// <summary>
/// 考核后其他绩效
/// </summary>
public Nullable<decimal> AssessLaterOtherFee { get; set; }
/// <summary>
/// 调节后其他绩效
/// </summary>
public Nullable<decimal> AdjustLaterOtherFee { get; set; }
/// <summary>
/// 考核后绩效
/// </summary>
public Nullable<decimal> AssessLaterPerforTotal { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 变更日志
/// </summary>
public string ChangeLog { get; set; }
}
}
performance/Performance.EntityModels/Entity/res_compute.cs
......@@ -52,12 +52,12 @@ public class res_compute
public string FitPeople { get; set; }
/// <summary>
/// 绩效基础核算参考值
///
/// </summary>
public Nullable<decimal> FitPeopleValue { get; set; }
/// <summary>
/// 绩效基数核算参考对象取值比例（如临床科室护士*95%）
///
/// </summary>
public Nullable<decimal> FitPeopleRatio { get; set; }
......@@ -137,6 +137,26 @@ public class res_compute
public Nullable<decimal> OtherPerfor { get; set; }
/// <summary>
/// 其他绩效2(来自人员名单)
/// </summary>
public Nullable<decimal> OtherPerfor2 { get; set; }
/// <summary>
/// 其他绩效3(来自人员名单)
/// </summary>
public Nullable<decimal> OtherPerfor3 { get; set; }
/// <summary>
/// 其他绩效4(来自人员名单)
/// </summary>
public Nullable<decimal> OtherPerfor4 { get; set; }
/// <summary>
/// 其他管理绩效(来自人员名单)
/// </summary>
public Nullable<decimal> OtherManagePerfor { get; set; }
/// <summary>
/// 夜班费
/// </summary>
public Nullable<decimal> NightWorkPerfor { get; set; }
......@@ -197,11 +217,6 @@ public class res_compute
public Nullable<decimal> ManagerNumber { get; set; }
/// <summary>
/// 其他管理绩效
/// </summary>
public Nullable<decimal> OtherManagePerfor { get; set; }
/// <summary>
/// 核算单元人员数量
/// </summary>
public Nullable<decimal> MedicalNumber { get; set; }
......@@ -215,10 +230,12 @@ public class res_compute
/// 考核前其他绩效
/// </summary>
public Nullable<decimal> AssessBeforeOtherFee { get; set; }
/// <summary>
/// 考核后其他绩效
/// </summary>
public Nullable<decimal> AssessLaterOtherFee { get; set; }
/// <summary>
/// 调节后其他绩效
/// </summary>
......
performance/Performance.EntityModels/Entity/res_reserved.cs
......@@ -31,6 +31,9 @@ public class res_reserved
/// </summary>
public int Year { get; set; }
/// <summary>
///
/// </summary>
public string UnitType { get; set; }
/// <summary>
......
performance/Performance.EntityModels/Entity/res_specialunit.cs
......@@ -115,18 +115,22 @@ public class res_specialunit
/// 业绩总绩效
/// </summary>
public Nullable<decimal> ResultsTotalFee { get; set; }
/// <summary>
/// 考核前绩效
/// </summary>
public Nullable<decimal> PerforTotal { get; set; }
/// <summary>
/// 考核前其他绩效
/// </summary>
public Nullable<decimal> AssessBeforeOtherFee { get; set; }
/// <summary>
/// 考核后其他绩效
/// </summary>
public Nullable<decimal> AssessLaterOtherFee { get; set; }
/// <summary>
/// 调节后其他绩效
/// </summary>
......
performance/Performance.Repository/Repository/PerforImemployeelogisticsRepository.cs
//-----------------------------------------------------------------------
// <copyright file=" im_employee_clinic.cs">
// * FileName: im_employee_clinic.cs
// <copyright file=" im_employee_logistics.cs">
// * FileName: im_employee_logistics.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
......@@ -9,7 +9,7 @@
namespace Performance.Repository
{
/// <summary>
/// im_employee_clinic Repository
/// im_employee_logistics Repository
/// </summary>
public partial class PerforImemployeelogisticsRepository : PerforRepository<im_employee_logistics>
{
......
performance/Performance.Repository/Repository/PerforModextractRepository.cs
////-----------------------------------------------------------------------
//// <copyright file=" mod_extract.cs">
//// * FileName: mod_extract.cs
//// </copyright>
////-----------------------------------------------------------------------
//using System;
//using Performance.EntityModels;
//-----------------------------------------------------------------------
// <copyright file=" mod_extract.cs">
// * FileName: mod_extract.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using Performance.EntityModels;
//namespace Performance.Repository
//{
// /// <summary>
// /// mod_extract Repository
// /// </summary>
// public partial class PerforModextractRepository : PerforRepository<mod_extract>
// {
// public PerforModextractRepository(PerformanceDbContext context) : base(context)
// {
// }
// }
//}
namespace Performance.Repository
{
/// <summary>
/// mod_extract Repository
/// </summary>
public partial class PerforModextractRepository : PerforRepository<mod_extract>
{
public PerforModextractRepository(PerformanceDbContext context) : base(context)
{
}
}
}
performance/Performance.Repository/Repository/PerforModitemRepository.cs
////-----------------------------------------------------------------------
//// <copyright file=" mod_item.cs">
//// * FileName: mod_item.cs
//// </copyright>
////-----------------------------------------------------------------------
//using System;
//using Performance.EntityModels;
//-----------------------------------------------------------------------
// <copyright file=" mod_item.cs">
// * FileName: mod_item.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using Performance.EntityModels;
//namespace Performance.Repository
//{
// /// <summary>
// /// mod_item Repository
// /// </summary>
// public partial class PerforModitemRepository : PerforRepository<mod_item>
// {
// public PerforModitemRepository(PerformanceDbContext context) : base(context)
// {
// }
// }
//}
namespace Performance.Repository
{
/// <summary>
/// mod_item Repository
/// </summary>
public partial class PerforModitemRepository : PerforRepository<mod_item>
{
public PerforModitemRepository(PerformanceDbContext context) : base(context)
{
}
}
}
performance/Performance.Repository/Repository/PerforModmoduleRepository.cs
////-----------------------------------------------------------------------
//// <copyright file=" mod_module.cs">
//// * FileName: mod_module.cs
//// </copyright>
////-----------------------------------------------------------------------
//using System;
//using Performance.EntityModels;
//-----------------------------------------------------------------------
// <copyright file=" mod_module.cs">
// * FileName: mod_module.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using Performance.EntityModels;
//namespace Performance.Repository
//{
// /// <summary>
// /// mod_module Repository
// /// </summary>
// public partial class PerforModmoduleRepository : PerforRepository<mod_module>
// {
// public PerforModmoduleRepository(PerformanceDbContext context) : base(context)
// {
// }
// }
//}
namespace Performance.Repository
{
/// <summary>
/// mod_module Repository
/// </summary>
public partial class PerforModmoduleRepository : PerforRepository<mod_module>
{
public PerforModmoduleRepository(PerformanceDbContext context) : base(context)
{
}
}
}
performance/Performance.Repository/Repository/PerforModspecialRepository.cs
////-----------------------------------------------------------------------
//// <copyright file=" mod_special.cs">
//// * FileName: mod_special.cs
//// </copyright>
////-----------------------------------------------------------------------
//using System;
//using Performance.EntityModels;
//-----------------------------------------------------------------------
// <copyright file=" mod_special.cs">
// * FileName: mod_special.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using Performance.EntityModels;
//namespace Performance.Repository
//{
// /// <summary>
// /// mod_special Repository
// /// </summary>
// public partial class PerforModspecialRepository : PerforRepository<mod_special>
// {
// public PerforModspecialRepository(PerformanceDbContext context) : base(context)
// {
// }
// }
//}
namespace Performance.Repository
{
/// <summary>
/// mod_special Repository
/// </summary>
public partial class PerforModspecialRepository : PerforRepository<mod_special>
{
public PerforModspecialRepository(PerformanceDbContext context) : base(context)
{
}
}
}
performance/Performance.Repository/Repository/PerforReportglobalRepository.cs 0 → 100644
//-----------------------------------------------------------------------
// <copyright file=" report_global.cs">
// * FileName: report_global.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using Performance.EntityModels;
namespace Performance.Repository
{
/// <summary>
/// report_global Repository
/// </summary>
public partial class PerforReportglobalRepository : PerforRepository<report_global>
{
public PerforReportglobalRepository(PerformanceDbContext context) : base(context)
{
}
}
}
performance/Performance.Repository/Repository/PerforReportoriginalpersontimeRepository.cs
//-----------------------------------------------------------------------
// <copyright file=" ag_header.cs">
// * FileName: ag_header.cs
// <copyright file=" report_original_persontime.cs">
// * FileName: report_original_persontime.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
......
performance/Performance.Repository/Repository/PerforReportoriginalstaysRepository.cs
//-----------------------------------------------------------------------
// <copyright file=" ag_header.cs">
// * FileName: ag_header.cs
//-----------------------------------------------------------------------
// <copyright file=" report_original_stays.cs">
// * FileName: report_original_stays.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using Performance.EntityModels;
namespace Performance.Repository
......
performance/Performance.Repository/Repository/PerforReportoriginalsurgeryRepository.cs
//-----------------------------------------------------------------------
// <copyright file=" ag_header.cs">
// * FileName: ag_header.cs
//-----------------------------------------------------------------------
// <copyright file=" report_original_surgery.cs">
// * FileName: report_original_surgery.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using Performance.EntityModels;
namespace Performance.Repository
......
performance/Performance.Repository/Repository/PerforReportperformanceRepository.cs 0 → 100644
//-----------------------------------------------------------------------
// <copyright file=" report_performance.cs">
// * FileName: report_performance.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.EntityFrameworkCore;
using Performance.EntityModels;
namespace Performance.Repository
{
/// <summary>
/// report_performance Repository
/// </summary>
public partial class PerforReportperformanceRepository : PerforRepository<report_performance>
{
private readonly PerformanceDbContext _db;
public PerforReportperformanceRepository(PerformanceDbContext context) : base(context)
{
_db = context;
}
}
}
performance/Performance.Repository/Repository/PerforcollectdataRepository.cs
//-----------------------------------------------------------------------
// <copyright file=" ag_againsituation.cs">
// * FileName: ag_againsituation.cs
// <copyright file=" collect_data.cs">
// * FileName: collect_data.cs
// </copyright>
//-----------------------------------------------------------------------
using Performance.EntityModels;
using System;
using Performance.EntityModels;
namespace Performance.Repository
{
/// <summary>
/// collect_data Repository
/// </summary>
public partial class PerforcollectdataRepository : PerforRepository<collect_data>
public partial class PerforCollectdataRepository : PerforRepository<collect_data>
{
public PerforcollectdataRepository(PerformanceDbContext context) : base(context)
public PerforCollectdataRepository(PerformanceDbContext context) : base(context)
{
}
}
......
performance/Performance.Repository/Repository/PerforcollectpermissionRepository.cs
//-----------------------------------------------------------------------
// <copyright file=" ag_againsituation.cs">
// * FileName: ag_againsituation.cs
// <copyright file=" collect_permission.cs">
// * FileName: collect_permission.cs
// </copyright>
//-----------------------------------------------------------------------
using Performance.EntityModels;
using System;
using Performance.EntityModels;
namespace Performance.Repository
{
/// <summary>
/// collect_permission Repository
/// </summary>
public partial class PerforcollectpermissionRepository : PerforRepository<collect_permission>
public partial class PerforCollectpermissionRepository : PerforRepository<collect_permission>
{
public PerforcollectpermissionRepository(PerformanceDbContext context) : base(context)
public PerforCollectpermissionRepository(PerformanceDbContext context) : base(context)
{
}
}
......
performance/Performance.Repository/Repository/PerforcustscriptRepository.cs
//-----------------------------------------------------------------------
// <copyright file=" ag_againsituation.cs">
// * FileName: ag_againsituation.cs
// <copyright file=" cust_script.cs">
// * FileName: cust_script.cs
// </copyright>
//-----------------------------------------------------------------------
using Performance.EntityModels;
using System;
using Performance.EntityModels;
namespace Performance.Repository
{
/// <summary>
/// collect_data Repository
/// cust_script Repository
/// </summary>
public partial class PerforcustscriptRepository : PerforRepository<cust_script>
public partial class PerforCustscriptRepository : PerforRepository<cust_script>
{
public PerforcustscriptRepository(PerformanceDbContext context) : base(context)
public PerforCustscriptRepository(PerformanceDbContext context) : base(context)
{
}
}
......
performance/Performance.Repository/Repository/PerforresreservedRepository.cs
//-----------------------------------------------------------------------
// <copyright file=" cof_guarantee.cs">
// * FileName: cof_guarantee.cs
// <copyright file=" res_reserved.cs">
// * FileName: res_reserved.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
......@@ -9,11 +9,11 @@
namespace Performance.Repository
{
/// <summary>
/// cof_guarantee Repository
/// res_reserved Repository
/// </summary>
public partial class PerforresreservedRepository : PerforRepository<res_reserved>
public partial class PerforResreservedRepository : PerforRepository<res_reserved>
{
public PerforresreservedRepository(PerformanceDbContext context) : base(context)
public PerforResreservedRepository(PerformanceDbContext context) : base(context)
{
}
}
......
performance/Performance.Services/AllotCompute/ResultComputeService.cs
......@@ -22,7 +22,7 @@ public class ResultComputeService : IAutoInjection
private readonly PerforPerallotRepository perforPerallotRepository;
private readonly PerforAgcomputeRepository perforAgcomputeRepository;
private readonly PerforAgsecondallotRepository perforAgsecondallotRepository;
private readonly PerforresreservedRepository perforresreservedRepository;
private readonly PerforResreservedRepository perforresreservedRepository;
private readonly PerforHospitalRepository hospitalRepository;
private readonly PerforImemployeeRepository perforImEmployeeRepository;
private readonly PerforRescomputeRepository perforRescomputeRepository;
......@@ -48,7 +48,7 @@ public class ResultComputeService : IAutoInjection
PerforPerallotRepository perforPerallotRepository,
PerforAgcomputeRepository perforAgcomputeRepository,
PerforAgsecondallotRepository perforAgsecondallotRepository,
PerforresreservedRepository perforresreservedRepository,
PerforResreservedRepository perforresreservedRepository,
PerforImemployeeclinicRepository perforImemployeeclinicRepository,
PerforImemployeelogisticsRepository perforImemployeelogisticsRepository)
{
......@@ -118,7 +118,6 @@ public List<res_baiscnorm> Compute(per_allot allot, List<PerSheet> accountSheet)
return baiscnormList;
}
/// <summary>
/// 特殊科室绩效计算
/// </summary>
......@@ -166,7 +165,6 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
return t.Quantity * t.QuantitativeIndicatorsValue * headcount;
});
foreach (var item in accountDataList)
{
//科室奖罚汇总结果
......@@ -503,7 +501,8 @@ private void ChangeRealGiveFee(res_reserved reserved, per_allot allot, decimal r
reserved.DecRatio = ratio;
}
}
#endregion
#endregion 预留金额
/// <summary>
/// 创建科室二次分配
......
performance/Performance.Services/AllotService.cs
......@@ -25,7 +25,7 @@ public class AllotService : IAutoInjection
private ProcessComputService processComputService;
private ResultComputeService resultComputeService;
private PerforLogdbugRepository logdbug;
private readonly PerforresreservedRepository perforresreservedRepository;
private readonly PerforResreservedRepository perforresreservedRepository;
private ConfigService configService;
private IHostingEnvironment _evn;
private ILogger<AllotService> _logger;
......@@ -55,7 +55,7 @@ public class AllotService : IAutoInjection
ResultComputeService resultComputeService,
ConfigService configService,
PerforLogdbugRepository logdbug,
PerforresreservedRepository perforresreservedRepository,
PerforResreservedRepository perforresreservedRepository,
IHostingEnvironment evn, ILogger<AllotService> logger,
IEmailService emailService,
IOptions<Application> options,
......
performance/Performance.Services/CollectService.cs
......@@ -23,8 +23,8 @@ public class CollectService : IAutoInjection
private readonly PerforImemployeeRepository perforImEmployeeRepository;
private readonly PerforImemployeeclinicRepository perforImemployeeclinicRepository;
private readonly PerforImemployeelogisticsRepository perforImemployeelogisticsRepository;
private readonly PerforcollectdataRepository perforcollectdataRepository;
private readonly PerforcollectpermissionRepository perforcollectpermissionRepository;
private readonly PerforCollectdataRepository perforcollectdataRepository;
private readonly PerforCollectpermissionRepository perforcollectpermissionRepository;
private readonly PerforUserroleRepository userroleRepository;
private readonly Application options;
......@@ -37,8 +37,8 @@ public class CollectService : IAutoInjection
PerforImemployeeRepository perforImEmployeeRepository,
PerforImemployeeclinicRepository perforImemployeeclinicRepository,
PerforImemployeelogisticsRepository perforImemployeelogisticsRepository,
PerforcollectdataRepository perforcollectdataRepository,
PerforcollectpermissionRepository perforcollectpermissionRepository,
PerforCollectdataRepository perforcollectdataRepository,
PerforCollectpermissionRepository perforcollectpermissionRepository,
PerforUserroleRepository userroleRepository,
IOptions<Application> options)
{
......@@ -113,7 +113,7 @@ into emppmss
SheetName = sh.SheetName,
SheetType = sh.SheetType.Value,
HeadName = sh.HeadName,
PermissionId = item?.ID,
PermissionId = item?.Id,
Readnoly = item?.Readnoly ?? 0,
AttachLast = item?.AttachLast ?? 0,
Visible = item?.Visible ?? 0
......@@ -148,7 +148,7 @@ public void SetPermission(int userid, IEnumerable<CollectPermission> collects)
if (data3 != null)
{
var ids = data3.Select(t => t.PermissionId).ToList();
var deletes = perforcollectpermissionRepository.GetEntities(w => ids.Contains(w.ID));
var deletes = perforcollectpermissionRepository.GetEntities(w => ids.Contains(w.Id));
if (deletes != null)
perforcollectpermissionRepository.RemoveRange(deletes.ToArray());
}
......@@ -158,14 +158,14 @@ public void SetPermission(int userid, IEnumerable<CollectPermission> collects)
if (data1 != null)
{
var ids = data1.Select(t => t.PermissionId).ToList();
var updates = perforcollectpermissionRepository.GetEntities(w => ids.Contains(w.ID));
var updates = perforcollectpermissionRepository.GetEntities(w => ids.Contains(w.Id));
if (updates != null)
{
foreach (var item in updates)
{
item.AttachLast = data1.FirstOrDefault(w => w.PermissionId == item.ID).AttachLast;
item.Readnoly = data1.FirstOrDefault(w => w.PermissionId == item.ID).Readnoly;
item.Visible = data1.FirstOrDefault(w => w.PermissionId == item.ID).Visible;
item.AttachLast = data1.FirstOrDefault(w => w.PermissionId == item.Id).AttachLast;
item.Readnoly = data1.FirstOrDefault(w => w.PermissionId == item.Id).Readnoly;
item.Visible = data1.FirstOrDefault(w => w.PermissionId == item.Id).Visible;
}
perforcollectpermissionRepository.UpdateRange(updates.ToArray());
}
......@@ -264,6 +264,7 @@ private IEnumerable<collect_permission> GetCollectSheetByAllot(int hospitalId, i
}
#region 加载采集内容
/// <summary>
/// 加载采集内容
/// </summary>
......@@ -311,7 +312,6 @@ public HandsonTable GetCollectData(int userId, int allotId, string sheetName)
if (permissions == null || !permissions.Any())
throw new PerformanceException("用户没有权限编辑当前SHEET页");
List<HandsonRowData> rowDatas = null;
var collectdata = perforcollectdataRepository.GetEntities(w => w.SheetName == sheet.SheetName && w.AllotID == allotId);
if (collectdata != null)
......@@ -438,7 +438,6 @@ private List<HandsonRowData> GerEmployee(per_sheet sheet)
return new List<HandsonRowData>();
}
private HandsonRowData CreateRowData(int row, ColumnInfo[] columns, SortedDictionary<string, object> dic)
{
var setdata = from cfg in columns
......@@ -446,7 +445,8 @@ private HandsonRowData CreateRowData(int row, ColumnInfo[] columns, SortedDictio
select new HandsonCellData(cfg.Description, dic[d]);
return new HandsonRowData(row, setdata);
}
#endregion
#endregion 加载采集内容
public void SaveCollectData(int allotId, SaveCollectData request)
{
......@@ -474,7 +474,6 @@ public void SaveCollectData(int allotId, SaveCollectData request)
else
config = CollectDataConfig.Default;
var dicData = CreateDataRow(allotId, request, config);
List<collect_data> datas = new List<collect_data>();
foreach (var item in dicData)
......
performance/Performance.Services/CustomExtractService.cs
......@@ -25,7 +25,7 @@ public class CustomExtractService : IAutoInjection
private readonly PerforPerallotRepository _perallotRepository;
private readonly PerforPerdeptdicRepository _perforPerdeptdicRepository;
private readonly PerforHospitalconfigRepository _perforHospitalconfigRepository;
private readonly PerforcustscriptRepository _perforcustscriptRepository;
private readonly PerforCustscriptRepository _perforcustscriptRepository;
public CustomExtractService(
ILogger<CustomExtractService> logger,
......@@ -35,7 +35,7 @@ public class CustomExtractService : IAutoInjection
PerforPerallotRepository perallotRepository,
PerforPerdeptdicRepository perforPerdeptdicRepository,
PerforHospitalconfigRepository perforHospitalconfigRepository,
PerforcustscriptRepository perforcustscriptRepository)
PerforCustscriptRepository perforcustscriptRepository)
{
_logger = logger;
_options = options;
......@@ -46,6 +46,7 @@ public class CustomExtractService : IAutoInjection
_perforHospitalconfigRepository = perforHospitalconfigRepository;
_perforcustscriptRepository = perforcustscriptRepository;
}
public bool CheckConfigScript(int userId, int allotId)
{
var allot = _perallotRepository.GetEntity(w => w.ID == allotId)
......@@ -201,7 +202,8 @@ private void WriteDataToFile(int userId, per_allot allot, List<cust_script> scri
if (string.IsNullOrEmpty(atUnitType) || !atUnitTypeList.Contains(atUnitType)) continue;
}
}
#endregion
#endregion 替换原始科室名称及跳过写入EXCEL逻辑
int col = 4;
for (int c = 0; c < headers.Count; c++)
......
performance/Performance.Services/DFExtractService.cs
......@@ -31,7 +31,7 @@ public class DFExtractService : IAutoInjection
private readonly PerforImspecialunitRepository perforImspecialunitRepository;
private readonly PerforImdataRepository perforImdataRepository;
private readonly PerforRepimportconfigRepository repimportconfigRepository;
private readonly PerforcollectdataRepository perforcollectdataRepository;
private readonly PerforCollectdataRepository perforcollectdataRepository;
private readonly PerforExitemRepository perforExitemRepository;
private readonly PerforExmoduleRepository perforExmoduleRepository;
......@@ -61,7 +61,7 @@ public class DFExtractService : IAutoInjection
PerforImspecialunitRepository perforImspecialunitRepository,
PerforImdataRepository perforImdataRepository,
PerforRepimportconfigRepository repimportconfigRepository,
PerforcollectdataRepository perforcollectdataRepository,
PerforCollectdataRepository perforcollectdataRepository,
PerforExitemRepository perforExitemRepository,
PerforExmoduleRepository perforExmoduleRepository,
......@@ -96,6 +96,7 @@ public class DFExtractService : IAutoInjection
this.personService = personService;
this.logManage = logManage;
}
#endregion
#region 抽取
......@@ -422,12 +423,15 @@ public string TemplateExecute(string email, sys_hospital hospital, List<sys_hosp
case SheetType.OtherIncome:
WriteOtherIncome(sheet, sheetRead, modules, items, data, sheetCollectData);
break;
case SheetType.Income:
WriteIncome(sheet, sheetRead, modules, items, data, sheetCollectData);
break;
case SheetType.Expend:
WriteExpend(sheet, sheetRead, modules, items, data, sheetCollectData);
break;
case SheetType.Workload:
case SheetType.OtherWorkload:
WriteWorkload(sheet, sheetRead, modules, items, data, sheetCollectData);
......@@ -518,18 +522,22 @@ public string AlllotExecute(string email, sys_hospital hospital, List<sys_hospit
ClearData(sheet, 5, 7);
WriteOtherIncome(sheet, sheetRead, modules, items, extracts, sheetCollectData, false);
break;
case SheetType.Income:
ClearData(sheet, 5, 3, true);
WriteIncome(sheet, sheetRead, modules, items, extracts, sheetCollectData, false);
break;
case SheetType.Expend:
ClearData(sheet, 5, 7);
WriteExpend(sheet, sheetRead, modules, items, extracts, sheetCollectData, false);
break;
case SheetType.Workload:
ClearData(sheet, 3, 3);
WriteWorkload(sheet, sheetRead, modules, items, extracts, sheetCollectData, false);
break;
case SheetType.OtherWorkload:
ClearData(sheet, 1, 3, true);
sheetRead = PerSheetDataFactory.GetDataRead(SheetType.Workload);
......@@ -542,6 +550,7 @@ public string AlllotExecute(string email, sys_hospital hospital, List<sys_hospit
ClearData(sheet, 2, 3, endCellNum: 4);
SupplySpecialUnit(sheet, sheetRead, specials, extracts, lastAllot, false);
break;
case SheetType.AccountExtra:
ClearData(sheet, 2, 3);
break;
......@@ -697,7 +706,6 @@ private void ImportData(per_allot allot, List<sys_hospitalconfig> configs)
}
}
private List<NewExtractDto> StandData(IEnumerable<ex_result> results)
{
if (results == null || !results.Any()) return new List<NewExtractDto>();
......@@ -947,7 +955,6 @@ public void GenRowStyle(IRow r, ICellStyle cellStyle)
//r.RowStyle = cellStyle;
}
#endregion
#region SheetData
......@@ -1027,7 +1034,6 @@ private void WriteEmployee(ISheet sheet, IPerSheetDataRead sheetRead, bool isNew
var cell = GetOrCreate(row, i);
OutToExcelCell(cell, func.Invoke(item));
}
}
GenRowStyle(row, CellStyle.CreateCellStyle(workbook, StyleType.数据));
beginRowIndex++;
......@@ -1110,7 +1116,6 @@ private void WriteClinicEmployee(ISheet sheet, IPerSheetDataRead sheetRead, bool
var cell = GetOrCreate(row, i);
OutToExcelCell(cell, func.Invoke(item));
}
}
GenRowStyle(row, CellStyle.CreateCellStyle(workbook, StyleType.数据));
beginRowIndex++;
......@@ -1206,7 +1211,6 @@ private void WriteAccountBasic(ISheet sheet, IPerSheetDataRead sheetRead, bool i
var cell = GetOrCreate(row, i);
OutToExcelCell(cell, func.Invoke(item));
}
}
GenRowStyle(row, CellStyle.CreateCellStyle(workbook, StyleType.数据));
beginRowIndex++;
......@@ -1593,7 +1597,6 @@ private void WriteSpecialCellValue(Dictionary<string, Func<ex_special, List<im_s
OutToExcelCell(newCell, value);
if (dictionary.ContainsKey(cell.StringCellValue) || (cell.StringCellValue == "数量" && !string.IsNullOrEmpty(value?.ToString())))
newCell.CellStyle = style;
}
}
......@@ -1640,8 +1643,8 @@ private void WriteSpecialCellValue(Dictionary<string, Func<ex_special, List<im_s
return merges;
};
#region 写入数据
/// <summary>
/// 写入列头
/// </summary>
......@@ -1882,7 +1885,6 @@ private void WriteWorkHeader(ISheet sheet, IPerSheetDataRead sheetRead, List<ex_
lastcellIndex++;
}
#endregion
}
/// <summary>
......@@ -1985,6 +1987,7 @@ private string HasValue(params string[] list)
return list.FirstOrDefault(t => !string.IsNullOrEmpty(t));
}
#endregion
#endregion
......@@ -2208,7 +2211,6 @@ private void WriteCollectWorkHeader(ISheet sheet, IPerSheetDataRead sheetRead, L
lastcellIndex++;
}
#endregion
}
private void WriteCollectWorkData(ISheet sheet, IPerSheetDataRead sheetRead, List<collect_data> data, bool isNewTemp)
......@@ -2345,17 +2347,20 @@ public void OutToExcelCell(ICell cell, object obj)
case "System.String"://字符串类型
cell.SetCellValue(value);
break;
case "System.DateTime"://日期类型
DateTime dateV;
DateTime.TryParse(value, out dateV);
cell.SetCellValue(dateV.ToString("yyyy/M/d"));
break;
case "System.Boolean"://布尔型
bool boolV = false;
bool.TryParse(value, out boolV);
cell.SetCellValue(boolV);
break;
case "System.Int16"://整型
case "System.Int32":
case "System.Int64":
......@@ -2364,15 +2369,18 @@ public void OutToExcelCell(ICell cell, object obj)
int.TryParse(value, out intV);
cell.SetCellValue(intV);
break;
case "System.Decimal"://浮点型
case "System.Double":
double doubV = 0;
double.TryParse(value, out doubV);
cell.SetCellValue(doubV);
break;
case "System.DBNull"://空值处理
cell.SetCellValue("");
break;
default:
cell.SetCellValue("");
break;
......@@ -2395,17 +2403,20 @@ public void OutToExcelCell<T>(ICell cell, object obj, T defaultValue = default)
case "System.String"://字符串类型
cell.SetCellValue(value);
break;
case "System.DateTime"://日期类型
DateTime dateV;
DateTime.TryParse(value, out dateV);
cell.SetCellValue(dateV.ToString("yyyy/M/d"));
break;
case "System.Boolean"://布尔型
bool boolV = false;
bool.TryParse(value, out boolV);
cell.SetCellValue(boolV);
break;
case "System.Int16"://整型
case "System.Int32":
case "System.Int64":
......@@ -2414,15 +2425,18 @@ public void OutToExcelCell<T>(ICell cell, object obj, T defaultValue = default)
int.TryParse(value, out intV);
cell.SetCellValue(intV);
break;
case "System.Decimal"://浮点型
case "System.Double":
double doubV = 0;
double.TryParse(value, out doubV);
cell.SetCellValue(doubV);
break;
case "System.DBNull"://空值处理
cell.SetCellValue("");
break;
default:
cell.SetCellValue("");
break;
......@@ -2437,6 +2451,7 @@ public void OutToExcelCell<T>(ICell cell, object obj, T defaultValue = default)
#endregion
#region 配置校验
/// <summary>
/// 配置校验
/// </summary>
......@@ -2495,6 +2510,7 @@ public string Judge(int allotId, int hospitalId, int useTemplate, ref bool isSin
}
return result;
}
#endregion
}
......@@ -2526,19 +2542,16 @@ public class CellRangeAddressAndValue
public CellRangeAddressAndValue()
: this(default, default, default, default, default)
{
}
public CellRangeAddressAndValue(CellRangeAddress address)
: this(address.FirstRow, address.LastRow, address.FirstColumn, address.LastColumn)
{
}
public CellRangeAddressAndValue(int firstRow, int lastRow, int firstCol, int lastCol)
: this(firstRow, lastRow, firstCol, lastCol, default)
{
}
public CellRangeAddressAndValue(int firstRow, int lastRow, int firstCol, int lastCol, string value, bool isMerge = true)
......
performance/Performance.Services/ExtractExcelService/ExtractService.cs
......@@ -21,7 +21,7 @@ public class ExtractService : IAutoInjection
private readonly PerSheetService perSheetService;
private readonly PerforHospitalRepository hospitalRepository;
private readonly PerforPerallotRepository perallotRepository;
private readonly PerforcollectdataRepository collectdataRepository;
private readonly PerforCollectdataRepository collectdataRepository;
private readonly PerforPeremployeeRepository peremployeeRepository;
public ExtractService(
......@@ -32,7 +32,7 @@ public class ExtractService : IAutoInjection
PerSheetService perSheetService,
PerforHospitalRepository hospitalRepository,
PerforPerallotRepository perallotRepository,
PerforcollectdataRepository collectdataRepository,
PerforCollectdataRepository collectdataRepository,
PerforPeremployeeRepository peremployeeRepository
)
{
......
performance/Performance.Services/GraphQLService.cs 0 → 100644
using Performance.DtoModels;
using Performance.EntityModels;
using Performance.Repository;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Text;
namespace Performance.Services
{
public class GraphQLService : IAutoInjection
{
private readonly PerforPeremployeeRepository peremployeeRepository;
private readonly PerforReportperformanceRepository reportperformanceRepository;
public GraphQLService(
PerforPeremployeeRepository peremployeeRepository,
PerforReportperformanceRepository reportperformanceRepository
)
{
this.peremployeeRepository = peremployeeRepository;
this.reportperformanceRepository = reportperformanceRepository;
}
public ReportData Test(int hospitalId, int year, int month)
{
return new ReportData(new rep_report())
{
ChartData = new List<ChartData>
{
new ChartData { X = "张三", Y = "语文", Value = 89 },
new ChartData { X = "张三", Y = "数学", Value = 99 },
new ChartData { X = "张三", Y = "英语", Value = 72 },
new ChartData { X = "李四", Y = "语文", Value = 92 },
new ChartData { X = "李四", Y = "数学", Value = 93 },
new ChartData { X = "李四", Y = "英语", Value = 80 },
}
};
}
public List<report_performance> GetPerformances(int hospitalId, int year, int month, string category)
{
Expression<Func<report_performance, bool>> exp = (t) => true;
if (hospitalId != 0)
{
exp = exp.And(t => t.HospitalId == hospitalId);
}
if (year != 0)
{
exp = exp.And(t => t.Year == year);
}
if (month != 0)
{
exp = exp.And(t => t.Month == month);
}
if (!string.IsNullOrEmpty(category))
{
exp = exp.And(t => category.Split(',').Contains(t.Category));
}
return reportperformanceRepository.GetEntities(exp);
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment