Skip to content

P
performance
Commit 92b3321d by 799284587@qq.com
Options

暂存绩效医技

parent d273e001
Showing with 171 additions and 329 deletions
performance/Performance.Api/Startup.cs
...@@ -67,6 +67,7 @@ public void ConfigureServices(IServiceCollection services) ...@@ -67,6 +67,7 @@ public void ConfigureServices(IServiceCollection services)
//筛选器配置 //筛选器配置
.AddMvc(option => .AddMvc(option =>
{ {
option.Filters.Add<AuthenticationFilter>();
option.Filters.Add<ActionsFilter>(); option.Filters.Add<ActionsFilter>();
option.Filters.Add<ExceptionsFilter>(); option.Filters.Add<ExceptionsFilter>();
}) })
......
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
...@@ -564,6 +564,9 @@ ...@@ -564,6 +564,9 @@
实发绩效 实发绩效
</summary> </summary>
</member> </member>
<member name="T:Performance.DtoModels.UnitType">
<summary> 核算单元类型 </summary>
</member>
<member name="F:Performance.DtoModels.SheetType.Unidentifiable"> <member name="F:Performance.DtoModels.SheetType.Unidentifiable">
<summary> 无法识别 </summary> <summary> 无法识别 </summary>
</member> </member>
...@@ -629,12 +632,6 @@ ...@@ -629,12 +632,6 @@
<member name="F:Performance.DtoModels.AccountUnitType.行政工勤"> <member name="F:Performance.DtoModels.AccountUnitType.行政工勤">
<summary> 临床科室 </summary> <summary> 临床科室 </summary>
</member> </member>
<member name="T:Performance.DtoModels.DirectorType">
<summary>
当前枚举为效率绩效、规模绩效中系数中文名称
对应表cof_director中JobTitle 全文字匹配
</summary>
</member>
<member name="P:Performance.DtoModels.PerData.UnitType"> <member name="P:Performance.DtoModels.PerData.UnitType">
<summary> <summary>
核算单元类别 （医生组/护理组） 核算单元类别 （医生组/护理组）
...@@ -790,14 +787,9 @@ ...@@ -790,14 +787,9 @@
核算单元类别 1 医生组 2护理组 3医技组 核算单元类别 1 医生组 2护理组 3医技组
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.DoctorAccountingUnit"> <member name="P:Performance.DtoModels.PerDataAccountBaisc.AccountingUnit">
<summary>
核算单元（医生组）
</summary>
</member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.NurseAccountingUnit">
<summary> <summary>
核算单元（护理组） 核算单元
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.Department"> <member name="P:Performance.DtoModels.PerDataAccountBaisc.Department">
...@@ -805,92 +797,47 @@ ...@@ -805,92 +797,47 @@
科室名称 科室名称
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.DoctorDirectorNumber"> <member name="P:Performance.DtoModels.PerDataAccountBaisc.ManagerNumber">
<summary> <summary>
科主任数量 科主任/护士长数量
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.DoctorNumber"> <member name="P:Performance.DtoModels.PerDataAccountBaisc.Number">
<summary> <summary>
核算单元医生数量 核算单元医生数量
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.DoctorBasicFactor"> <member name="P:Performance.DtoModels.PerDataAccountBaisc.BasicFactor">
<summary> <summary>
医生基础系数 医生基础系数
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.DoctorSlopeFactor"> <member name="P:Performance.DtoModels.PerDataAccountBaisc.SlopeFactor">
<summary> <summary>
倾斜系数 倾斜系数
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.DoctorOtherPerfor1"> <member name="P:Performance.DtoModels.PerDataAccountBaisc.OtherPerfor1">
<summary> <summary>
其他绩效1 其他绩效1
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.DoctorOtherPerfor2"> <member name="P:Performance.DtoModels.PerDataAccountBaisc.OtherPerfor2">
<summary> <summary>
其他绩效2 其他绩效2
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.DoctorExtra"> <member name="P:Performance.DtoModels.PerDataAccountBaisc.Extra">
<summary> <summary>
医院奖罚 医院奖罚
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.DoctorScoringAverage"> <member name="P:Performance.DtoModels.PerDataAccountBaisc.ScoringAverage">
<summary> <summary>
考核对分率 考核对分率
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.DoctorAdjustFactor"> <member name="P:Performance.DtoModels.PerDataAccountBaisc.AdjustFactor">
<summary>
调节系数
</summary>
</member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.NurseHeadNumber">
<summary>
护士长人数
</summary>
</member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.NurseNumber">
<summary>
核算单元护士数量
</summary>
</member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.NurseBasicFactor">
<summary>
护理基础系数
</summary>
</member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.NurseSlopeFactor">
<summary>
护理倾斜系数
</summary>
</member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.NurseOtherPerfor1">
<summary>
其他绩效1
</summary>
</member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.NurseOtherPerfor2">
<summary>
其他绩效2
</summary>
</member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.NurseExtra">
<summary>
医院奖罚
</summary>
</member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.NurseScoringAverage">
<summary>
考核对分率
</summary>
</member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.NurseAdjustFactor">
<summary> <summary>
调节系数 调节系数
</summary> </summary>
...@@ -900,32 +847,17 @@ ...@@ -900,32 +847,17 @@
行号 行号
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.DoctorScale"> <member name="P:Performance.DtoModels.PerDataAccountBaisc.Scale">
<summary>
规模绩效系数
</summary>
</member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.DoctorEffic">
<summary>
效率绩效系数
</summary>
</member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.DoctorGrant">
<summary>
发放系数
</summary>
</member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.NurseScale">
<summary> <summary>
规模绩效系数 规模绩效系数
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.NurseEffic"> <member name="P:Performance.DtoModels.PerDataAccountBaisc.Effic">
<summary> <summary>
效率绩效系数 效率绩效系数
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.NurseGrant"> <member name="P:Performance.DtoModels.PerDataAccountBaisc.Grant">
<summary> <summary>
发放系数 发放系数
</summary> </summary>
......
performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs
using AutoMapper; using AutoMapper;
using Performance.EntityModels; using Performance.EntityModels;
using Performance.Infrastructure;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text; using System.Text;
namespace Performance.DtoModels.AutoMapper namespace Performance.DtoModels.AutoMapper
...@@ -68,20 +70,66 @@ public AutoMapperConfigs() ...@@ -68,20 +70,66 @@ public AutoMapperConfigs()
CreateMap<PerData, im_data>() CreateMap<PerData, im_data>()
.ForMember(dest => dest.IsFactor, opt => opt.MapFrom(src => src.IsFactor ? 1 : 2)) .ForMember(dest => dest.IsFactor, opt => opt.MapFrom(src => src.IsFactor ? 1 : 2))
.ForMember(dest => dest.UnitType, opt => opt.MapFrom(src => src.UnitType == "医生组" ? 1 : (src.UnitType == "护理组" ? 2 : (src.UnitType == "护理组" ? 3 : 0)))); .ForMember(dest => dest.UnitType, opt => opt.MapFrom(src => EnumHelper.GetItems<UnitType>().FirstOrDefault(t => t.Name == src.UnitType).Value));
CreateMap<im_header, PerHeader>() CreateMap<im_header, PerHeader>()
.ForMember(dest => dest.IsMerge, opt => opt.MapFrom(src => src.IsMerge == 1 ? true : false)); .ForMember(dest => dest.IsMerge, opt => opt.MapFrom(src => src.IsMerge == 1 ? true : false));
CreateMap<im_data, PerData>() CreateMap<im_data, PerData>()
.ForMember(dest => dest.IsFactor, opt => opt.MapFrom(src => src.IsFactor == 1 ? true : false)) .ForMember(dest => dest.IsFactor, opt => opt.MapFrom(src => src.IsFactor == 1 ? true : false))
.ForMember(dest => dest.UnitType, opt => opt.MapFrom(src => src.UnitType == 1 ? "医生组" : (src.UnitType == 2 ? "护理组" : (src.UnitType == 3 ? "医技组" : "")))); .ForMember(dest => dest.UnitType, opt => opt.MapFrom(src => EnumHelper.GetItems<UnitType>().FirstOrDefault(t => t.Value == src.UnitType).Name));
CreateMap<PerDataEmployee, im_employee>(); CreateMap<PerDataEmployee, im_employee>();
CreateMap<im_employee, PerDataEmployee>(); CreateMap<im_employee, PerDataEmployee>();
CreateMap<PerDataAccountBaisc, PerDataAccountDoctor>() CreateMap<PerDataAccountBaisc, PerDataAccountDoctor>()
.ForMember(dest => dest.AccountingUnit, opt => opt.MapFrom(src => src.AccountingUnit))
.ForMember(dest => dest.Department, opt => opt.MapFrom(src => src.Department))
.ForMember(dest => dest.Number, opt => opt.MapFrom(src => src.Number))
.ForMember(dest => dest.BasicFactor, opt => opt.MapFrom(src => src.BasicFactor))
.ForMember(dest => dest.SlopeFactor, opt => opt.MapFrom(src => src.SlopeFactor))
.ForMember(dest => dest.OtherPerfor1, opt => opt.MapFrom(src => src.OtherPerfor1))
.ForMember(dest => dest.OtherPerfor2, opt => opt.MapFrom(src => src.OtherPerfor2))
.ForMember(dest => dest.Extra, opt => opt.MapFrom(src => src.Extra))
.ForMember(dest => dest.ScoringAverage, opt => opt.MapFrom(src => src.ScoringAverage))
.ForMember(dest => dest.AdjustFactor, opt => opt.MapFrom(src => src.AdjustFactor));
CreateMap<PerDataAccountBaisc, PerDataAccount>()
.ForMember(dest => dest.AccountingUnit, opt => opt.MapFrom(src => src.AccountingUnit))
.ForMember(dest => dest.Department, opt => opt.MapFrom(src => src.Department))
.ForMember(dest => dest.Number, opt => opt.MapFrom(src => src.Number))
.ForMember(dest => dest.BasicFactor, opt => opt.MapFrom(src => src.BasicFactor))
.ForMember(dest => dest.SlopeFactor, opt => opt.MapFrom(src => src.SlopeFactor))
.ForMember(dest => dest.OtherPerfor1, opt => opt.MapFrom(src => src.OtherPerfor1))
.ForMember(dest => dest.OtherPerfor2, opt => opt.MapFrom(src => src.OtherPerfor2))
.ForMember(dest => dest.Extra, opt => opt.MapFrom(src => src.Extra))
.ForMember(dest => dest.ScoringAverage, opt => opt.MapFrom(src => src.ScoringAverage))
.ForMember(dest => dest.AdjustFactor, opt => opt.MapFrom(src => src.AdjustFactor));
//CreateMap<PerDataAccountBaisc, im_accountbasic>();
//CreateMap<im_accountbasic, PerDataAccountBaisc>();
CreateMap<PerDataAccountBaisc, im_accountbasic>()
.ForMember(dest => dest.UnitType, opt => opt.MapFrom(src => src.UnitType))
.ForMember(dest => dest.DoctorAccountingUnit, opt => opt.MapFrom(src => src.AccountingUnit))
.ForMember(dest => dest.Department, opt => opt.MapFrom(src => src.Department))
.ForMember(dest => dest.DoctorDirectorNumber, opt => opt.MapFrom(src => src.ManagerNumber))
.ForMember(dest => dest.DoctorNumber, opt => opt.MapFrom(src => src.Number))
.ForMember(dest => dest.DoctorBasicFactor, opt => opt.MapFrom(src => src.BasicFactor))
.ForMember(dest => dest.DoctorSlopeFactor, opt => opt.MapFrom(src => src.SlopeFactor))
.ForMember(dest => dest.DoctorOtherPerfor1, opt => opt.MapFrom(src => src.OtherPerfor1))
.ForMember(dest => dest.DoctorOtherPerfor2, opt => opt.MapFrom(src => src.OtherPerfor2))
.ForMember(dest => dest.DoctorExtra, opt => opt.MapFrom(src => src.Extra))
.ForMember(dest => dest.DoctorScoringAverage, opt => opt.MapFrom(src => src.ScoringAverage))
.ForMember(dest => dest.DoctorAdjustFactor, opt => opt.MapFrom(src => src.AdjustFactor))
.ForMember(dest => dest.DoctorScale, opt => opt.MapFrom(src => src.Scale))
.ForMember(dest => dest.DoctorEffic, opt => opt.MapFrom(src => src.Effic))
.ForMember(dest => dest.DoctorGrant, opt => opt.MapFrom(src => src.Grant));
CreateMap<im_accountbasic, PerDataAccountBaisc>()
.ForMember(dest => dest.UnitType, opt => opt.MapFrom(src => src.UnitType))
.ForMember(dest => dest.AccountingUnit, opt => opt.MapFrom(src => src.DoctorAccountingUnit)) .ForMember(dest => dest.AccountingUnit, opt => opt.MapFrom(src => src.DoctorAccountingUnit))
.ForMember(dest => dest.Department, opt => opt.MapFrom(src => src.Department)) .ForMember(dest => dest.Department, opt => opt.MapFrom(src => src.Department))
.ForMember(dest => dest.ManagerNumber, opt => opt.MapFrom(src => src.DoctorDirectorNumber))
.ForMember(dest => dest.Number, opt => opt.MapFrom(src => src.DoctorNumber)) .ForMember(dest => dest.Number, opt => opt.MapFrom(src => src.DoctorNumber))
.ForMember(dest => dest.BasicFactor, opt => opt.MapFrom(src => src.DoctorBasicFactor)) .ForMember(dest => dest.BasicFactor, opt => opt.MapFrom(src => src.DoctorBasicFactor))
.ForMember(dest => dest.SlopeFactor, opt => opt.MapFrom(src => src.DoctorSlopeFactor)) .ForMember(dest => dest.SlopeFactor, opt => opt.MapFrom(src => src.DoctorSlopeFactor))
...@@ -89,22 +137,11 @@ public AutoMapperConfigs() ...@@ -89,22 +137,11 @@ public AutoMapperConfigs()
.ForMember(dest => dest.OtherPerfor2, opt => opt.MapFrom(src => src.DoctorOtherPerfor2)) .ForMember(dest => dest.OtherPerfor2, opt => opt.MapFrom(src => src.DoctorOtherPerfor2))
.ForMember(dest => dest.Extra, opt => opt.MapFrom(src => src.DoctorExtra)) .ForMember(dest => dest.Extra, opt => opt.MapFrom(src => src.DoctorExtra))
.ForMember(dest => dest.ScoringAverage, opt => opt.MapFrom(src => src.DoctorScoringAverage)) .ForMember(dest => dest.ScoringAverage, opt => opt.MapFrom(src => src.DoctorScoringAverage))
.ForMember(dest => dest.AdjustFactor, opt => opt.MapFrom(src => src.DoctorAdjustFactor)); .ForMember(dest => dest.AdjustFactor, opt => opt.MapFrom(src => src.DoctorAdjustFactor))
.ForMember(dest => dest.Scale, opt => opt.MapFrom(src => src.DoctorScale))
.ForMember(dest => dest.Effic, opt => opt.MapFrom(src => src.DoctorEffic))
.ForMember(dest => dest.Grant, opt => opt.MapFrom(src => src.DoctorGrant));
CreateMap<PerDataAccountBaisc, PerDataAccountNurse>()
.ForMember(dest => dest.AccountingUnit, opt => opt.MapFrom(src => src.NurseAccountingUnit))
.ForMember(dest => dest.Department, opt => opt.MapFrom(src => src.Department))
.ForMember(dest => dest.Number, opt => opt.MapFrom(src => src.NurseNumber))
.ForMember(dest => dest.BasicFactor, opt => opt.MapFrom(src => src.NurseBasicFactor))
.ForMember(dest => dest.SlopeFactor, opt => opt.MapFrom(src => src.NurseSlopeFactor))
.ForMember(dest => dest.OtherPerfor1, opt => opt.MapFrom(src => src.NurseOtherPerfor1))
.ForMember(dest => dest.OtherPerfor2, opt => opt.MapFrom(src => src.NurseOtherPerfor2))
.ForMember(dest => dest.Extra, opt => opt.MapFrom(src => src.NurseExtra))
.ForMember(dest => dest.ScoringAverage, opt => opt.MapFrom(src => src.NurseScoringAverage))
.ForMember(dest => dest.AdjustFactor, opt => opt.MapFrom(src => src.NurseAdjustFactor));
CreateMap<PerDataAccountBaisc, im_accountbasic>();
CreateMap<im_accountbasic, PerDataAccountBaisc>();
CreateMap<PerDataSpecialUnit, im_specialunit>(); CreateMap<PerDataSpecialUnit, im_specialunit>();
CreateMap<PerDataAccountDoctor, res_accountdoctor>(); CreateMap<PerDataAccountDoctor, res_accountdoctor>();
CreateMap<res_accountdoctor, PerDataAccount>(); CreateMap<res_accountdoctor, PerDataAccount>();
......
performance/Performance.DtoModels/Enum.cs
...@@ -17,9 +17,9 @@ public enum SmsCodeType ...@@ -17,9 +17,9 @@ public enum SmsCodeType
/// <summary> 用户状态 </summary> /// <summary> 用户状态 </summary>
public enum States public enum States
{ {
[Description("登录")] [Description("启用")]
Enabled = 1, Enabled = 1,
[Description("其他")] [Description("禁用")]
Disabled = 2, Disabled = 2,
} }
......
performance/Performance.DtoModels/PerExcel/ComputeResult.cs
...@@ -125,6 +125,8 @@ public class ComputeResult ...@@ -125,6 +125,8 @@ public class ComputeResult
/// </summary> /// </summary>
public decimal? Adjust { get; set; } public decimal? Adjust { get; set; }
public string UnitType { get; set; }
///// <summary> ///// <summary>
///// 工作量绩效 ///// 工作量绩效
///// </summary> ///// </summary>
......
performance/Performance.DtoModels/PerExcel/ExcelEnum.cs
...@@ -11,6 +11,18 @@ public enum ExcelVersion ...@@ -11,6 +11,18 @@ public enum ExcelVersion
xls xls
} }
/// <summary> 核算单元类型 </summary>
public enum UnitType
{
[Description("医生组")]
医生组 = 1,
[Description("护理组")]
护理组 = 2,
[Description("医技组")]
医技组 = 3,
}
public enum SheetType public enum SheetType
{ {
/// <summary> 无法识别 </summary> /// <summary> 无法识别 </summary>
...@@ -59,58 +71,6 @@ public enum SheetType ...@@ -59,58 +71,6 @@ public enum SheetType
} }
/// <summary> /// <summary>
/// 绩效类型
/// </summary>
//public enum PerformanceType
//{
// /// <summary> </summary>
// [Description("")]
// Null = 0,
// /// <summary> 绩效基数临床科室主任(专门用来计算科主任绩效，由此产生=>>临床科室主任人均绩效)</summary>
// [Description("绩效基数临床科室主任")]
// StandardDirector = 1,
// /// <summary> 绩效基数临床科室副主任(专门用来计算科主任绩效，由此产生=>>临床科室副主任人均绩效) </summary>
// [Description("绩效基数临床科室副主任")]
// StandardDeputyDirector = 2,
// /// <summary> 绩效基数临床科室护士长(专门用来计算科主任绩效，由此产生=>>临床科室护士长人均绩效) </summary>
// [Description("绩效基数临床科室护士长")]
// StandardNurse = 3,
// /// <summary> 绩效基数医技科室主任(专门用来计算科主任绩效，由此产生=>>医技科室主任人均绩效) </summary>
// [Description("绩效基数医技科室主任")]
// StandardDirectorYJ = 14,
// /// <summary> 临床科室主任人均绩效 (绩效标准取 科室主任人均绩效) </summary>
// [Description("临床科室主任人均绩效")]
// ReferenceDirector = 4,
// /// <summary> 临床科室中层人均绩效 (绩效标准取 科室主任/护士长/科室副主任/医技主任 平均值) </summary>
// [Description("临床科室中层人均绩效")]
// ReferenceDirectorAvg = 5,
// /// <summary> 临床科室护士长人均绩效 (绩效标准取 护士长 平均值)</summary>
// [Description("临床科室护士长人均绩效")]
// ReferenceHeadNurse = 7,
// /// <summary> 临床科室副主任人均绩效 </summary>
// [Description("临床科室副主任人均绩效")]
// ReferenceDeputyDirector = 8,
// /// <summary> 临床科室医生人均绩效 </summary>
// [Description("临床科室医生人均绩效")]
// ReferenceDoctor = 9,
// /// <summary> 临床科室护士人均绩效 </summary>
// [Description("临床科室护士人均绩效")]
// ReferenceNurse = 10,
// /// <summary> 行政工勤人均绩效 </summary>
// [Description("行政工勤人均绩效")]
// LogisticsWorker = 11,
// /// <summary> 行政中层人均绩效 </summary>
// [Description("行政中层人均绩效")]
// MiddleManager = 12,
// /// <summary> 行政高层人均绩效 </summary>
// [Description("行政高层人均绩效")]
// TopManager = 13,
//}
/// <summary>
/// 核算单元类型 /// 核算单元类型
/// </summary> /// </summary>
public enum AccountUnitType public enum AccountUnitType
...@@ -165,16 +125,16 @@ public enum PerforType ...@@ -165,16 +125,16 @@ public enum PerforType
医生护士平均, 医生护士平均,
} }
/// <summary> ///// <summary>
/// 当前枚举为效率绩效、规模绩效中系数中文名称 ///// 当前枚举为效率绩效、规模绩效中系数中文名称
/// 对应表cof_director中JobTitle 全文字匹配 ///// 对应表cof_director中JobTitle 全文字匹配
/// </summary> ///// </summary>
public enum DirectorType //public enum DirectorType
{ //{
临床科室主任, // 临床科室主任,
临床科室副主任, // 临床科室副主任,
医技科室主任, // 医技科室主任,
医技科室副主任, // 医技科室副主任,
临床科室护士长, // 临床科室护士长,
} //}
} }
performance/Performance.DtoModels/PerExcel/PerDataAccountBaisc.cs
...@@ -13,14 +13,9 @@ public class PerDataAccountBaisc : IPerData ...@@ -13,14 +13,9 @@ public class PerDataAccountBaisc : IPerData
public Nullable<int> UnitType { get; set; } public Nullable<int> UnitType { get; set; }
/// <summary> /// <summary>
/// 核算单元（医生组） /// 核算单元
/// </summary> /// </summary>
public string DoctorAccountingUnit { get; set; } public string AccountingUnit { get; set; }
/// <summary>
/// 核算单元（护理组）
/// </summary>
public string NurseAccountingUnit { get; set; }
/// <summary> /// <summary>
/// 科室名称 /// 科室名称
...@@ -28,93 +23,50 @@ public class PerDataAccountBaisc : IPerData ...@@ -28,93 +23,50 @@ public class PerDataAccountBaisc : IPerData
public string Department { get; set; } public string Department { get; set; }
/// <summary> /// <summary>
/// 科主任数量 /// 科主任/护士长数量
/// </summary> /// </summary>
public decimal DoctorDirectorNumber { get; set; } public decimal ManagerNumber { get; set; }
/// <summary> /// <summary>
/// 核算单元医生数量 /// 核算单元医生数量
/// </summary> /// </summary>
public decimal DoctorNumber { get; set; } public decimal Number { get; set; }
/// <summary> /// <summary>
/// 医生基础系数 /// 医生基础系数
/// </summary> /// </summary>
public decimal DoctorBasicFactor { get; set; } public decimal BasicFactor { get; set; }
/// <summary> /// <summary>
/// 倾斜系数 /// 倾斜系数
/// </summary> /// </summary>
public decimal DoctorSlopeFactor { get; set; } public decimal SlopeFactor { get; set; }
/// <summary> /// <summary>
/// 其他绩效1 /// 其他绩效1
/// </summary> /// </summary>
public decimal DoctorOtherPerfor1 { get; set; } public decimal OtherPerfor1 { get; set; }
/// <summary> /// <summary>
/// 其他绩效2 /// 其他绩效2
/// </summary> /// </summary>
public decimal DoctorOtherPerfor2 { get; set; } public decimal OtherPerfor2 { get; set; }
/// <summary> /// <summary>
/// 医院奖罚 /// 医院奖罚
/// </summary> /// </summary>
public decimal DoctorExtra { get; set; } public decimal Extra { get; set; }
/// <summary> /// <summary>
/// 考核对分率 /// 考核对分率
/// </summary> /// </summary>
public decimal DoctorScoringAverage { get; set; } public decimal ScoringAverage { get; set; }
/// <summary> /// <summary>
/// 调节系数 /// 调节系数
/// </summary> /// </summary>
public decimal DoctorAdjustFactor { get; set; } public decimal AdjustFactor { get; set; }
/// <summary>
/// 护士长人数
/// </summary>
public decimal NurseHeadNumber { get; set; }
/// <summary>
/// 核算单元护士数量
/// </summary>
public decimal NurseNumber { get; set; }
/// <summary>
/// 护理基础系数
/// </summary>
public decimal NurseBasicFactor { get; set; }
/// <summary>
/// 护理倾斜系数
/// </summary>
public decimal NurseSlopeFactor { get; set; }
/// <summary>
/// 其他绩效1
/// </summary>
public decimal NurseOtherPerfor1 { get; set; }
/// <summary>
/// 其他绩效2
/// </summary>
public decimal NurseOtherPerfor2 { get; set; }
/// <summary> /// <summary>
/// 医院奖罚
/// </summary>
public decimal NurseExtra { get; set; }
/// <summary>
/// 考核对分率
/// </summary>
public decimal NurseScoringAverage { get; set; }
/// <summary>
/// 调节系数
/// </summary>
public decimal NurseAdjustFactor { get; set; }
/// <summary>
/// 行号 /// 行号
/// </summary> /// </summary>
public int RowNumber { get; set; } public int RowNumber { get; set; }
...@@ -122,31 +74,16 @@ public class PerDataAccountBaisc : IPerData ...@@ -122,31 +74,16 @@ public class PerDataAccountBaisc : IPerData
/// <summary> /// <summary>
/// 规模绩效系数 /// 规模绩效系数
/// </summary> /// </summary>
public Nullable<decimal> DoctorScale { get; set; } public Nullable<decimal> Scale { get; set; }
/// <summary>
/// 效率绩效系数
/// </summary>
public Nullable<decimal> DoctorEffic { get; set; }
/// <summary>
/// 发放系数
/// </summary>
public Nullable<decimal> DoctorGrant { get; set; }
/// <summary>
/// 规模绩效系数
/// </summary>
public Nullable<decimal> NurseScale { get; set; }
/// <summary> /// <summary>
/// 效率绩效系数 /// 效率绩效系数
/// </summary> /// </summary>
public Nullable<decimal> NurseEffic { get; set; } public Nullable<decimal> Effic { get; set; }
/// <summary> /// <summary>
/// 发放系数 /// 发放系数
/// </summary> /// </summary>
public Nullable<decimal> NurseGrant { get; set; } public Nullable<decimal> Grant { get; set; }
} }
} }
performance/Performance.Services/AllotCompute/BaiscNormService.cs
...@@ -19,38 +19,28 @@ public class BaiscNormService : IAutoInjection ...@@ -19,38 +19,28 @@ public class BaiscNormService : IAutoInjection
/// </summary> /// </summary>
/// <param name="computes"></param> /// <param name="computes"></param>
/// <returns></returns> /// <returns></returns>
public List<res_baiscnorm> ComputeAvg(List<res_baiscnorm> baiscnormList, List<im_accountbasic> accountbasicList, public List<res_baiscnorm> ComputeAvg(List<res_baiscnorm> baiscnormList, List<im_accountbasic> accountbasicList, List<ComputeResult> computes)
List<ComputeResult> computes, List<im_employee> empolyeeList)
{ {
var keyList = new[] var keyList = new[]
{ {
//绩效基数平均值项目 //绩效基数平均值项目
new { type = AccountUnitType.临床科室, reference = PerforType.临床主任 }, new { Reference = PerforType.临床主任 , UnitType = UnitType.医生组},
new { type = AccountUnitType.临床科室, reference = PerforType.护士长 }, new { Reference = PerforType.护士长, UnitType = UnitType.医生组 },
new { type = AccountUnitType.医技科室, reference = PerforType.医技主任 }, new { Reference = PerforType.医技主任, UnitType = UnitType.医技组 },
//new { type = AccountUnitType.临床科室, reference = PerforType.临床副主任 },
//new { type = AccountUnitType.医技科室, reference = PerforType.医技副主任 },
}; };
foreach (var item in keyList) foreach (var item in keyList)
{ {
var accountingUnitList = empolyeeList.Where(t => t.AccountType == item.type.ToString()).Select(t => t.AccountingUnit).ToList(); var count = accountbasicList.Where(t => t.UnitType == (int)item.UnitType).Sum(t => t.DoctorDirectorNumber);
if (accountingUnitList.Any()) var dataList = computes.Where(t => t.UnitType == item.UnitType.ToString());
{
var count = (item.reference == PerforType.护士长)
? accountbasicList.Where(t => accountingUnitList.Contains(t.NurseAccountingUnit)).Sum(t => t.NurseHeadNumber)
: accountbasicList.Where(t => accountingUnitList.Contains(t.DoctorAccountingUnit)).Sum(t => t.DoctorDirectorNumber);
var dataList = computes.Where(t => t.AccountType == item.type.ToString() && t.FitPeople == EnumHelper.GetDescription(item.reference));
var baiscnorm = new res_baiscnorm var baiscnorm = new res_baiscnorm
{ {
PositionName = EnumHelper.GetDescription(item.reference), PositionName = EnumHelper.GetDescription(item.Reference),
TotelNumber = count, TotelNumber = count,
TotelValue = dataList?.Sum(t => t.GiveFee), TotelValue = dataList?.Sum(t => t.GiveFee),
AvgValue = dataList?.Sum(t => t.GiveFee) / count AvgValue = dataList?.Sum(t => t.GiveFee) / count
}; };
baiscnormList.Add(baiscnorm); baiscnormList.Add(baiscnorm);
} }
}
return baiscnormList; return baiscnormList;
} }
......
performance/Performance.Services/AllotCompute/CheckDataService.cs
...@@ -204,7 +204,7 @@ public bool CheckData(PerExcel excel, per_allot allot) ...@@ -204,7 +204,7 @@ public bool CheckData(PerExcel excel, per_allot allot)
var dataList = sheet.PerData.Select(t => (PerDataAccountBaisc)t); var dataList = sheet.PerData.Select(t => (PerDataAccountBaisc)t);
foreach (var item in dataList) foreach (var item in dataList)
{ {
if (string.IsNullOrEmpty(item.DoctorAccountingUnit) && string.IsNullOrEmpty(item.NurseAccountingUnit)) if (string.IsNullOrEmpty(item.AccountingUnit))
{ {
flag = false; flag = false;
rowNumber.Add(item.RowNumber + 1); rowNumber.Add(item.RowNumber + 1);
......
performance/Performance.Services/AllotCompute/ProcessComputService.cs
...@@ -245,22 +245,22 @@ private PerSheet ComputeDoctor(IEnumerable<PerDataAccountBaisc> dataList, List<P ...@@ -245,22 +245,22 @@ private PerSheet ComputeDoctor(IEnumerable<PerDataAccountBaisc> dataList, List<P
foreach (var dept in dataList.Where(t => t.UnitType == 1)) foreach (var dept in dataList.Where(t => t.UnitType == 1))
{ {
if (string.IsNullOrEmpty(dept.DoctorAccountingUnit)) continue; if (string.IsNullOrEmpty(dept.AccountingUnit)) continue;
var econDoctor = economicData.FirstOrDefault(t => t.UnitType == "医生组" && t.AccountingUnit == dept.Department); var econDoctor = economicData.FirstOrDefault(t => t.UnitType == "医生组" && t.AccountingUnit == dept.Department);
var workDoctor = workloadData.FirstOrDefault(t => t.UnitType == "医生组" && t.AccountingUnit == dept.Department); var workDoctor = workloadData.FirstOrDefault(t => t.UnitType == "医生组" && t.AccountingUnit == dept.Department);
var doctor = new PerDataAccountDoctor var doctor = new PerDataAccountDoctor
{ {
AccountingUnit = dept.DoctorAccountingUnit, AccountingUnit = dept.AccountingUnit,
Department = dept.Department, Department = dept.Department,
Number = dept.DoctorNumber + dept.DoctorDirectorNumber, Number = dept.Number + dept.ManagerNumber,
BasicFactor = dept.DoctorBasicFactor, BasicFactor = dept.BasicFactor,
SlopeFactor = dept.DoctorSlopeFactor, SlopeFactor = dept.SlopeFactor,
OtherPerfor1 = dept.DoctorOtherPerfor1, OtherPerfor1 = dept.OtherPerfor1,
OtherPerfor2 = dept.DoctorOtherPerfor2, OtherPerfor2 = dept.OtherPerfor2,
Extra = dept.DoctorExtra, Extra = dept.Extra,
ScoringAverage = dept.DoctorScoringAverage == 0m ? 1 : dept.DoctorScoringAverage, ScoringAverage = dept.ScoringAverage == 0m ? 1 : dept.ScoringAverage,
AdjustFactor = dept.DoctorAdjustFactor == 0m ? 1 : dept.DoctorAdjustFactor, AdjustFactor = dept.AdjustFactor == 0m ? 1 : dept.AdjustFactor,
Income = econDoctor?.CellValue ?? 0, Income = econDoctor?.CellValue ?? 0,
WorkloadFee = workDoctor?.CellValue ?? 0, WorkloadFee = workDoctor?.CellValue ?? 0,
}; };
...@@ -313,22 +313,22 @@ private PerSheet ComputeNurse(IEnumerable<PerDataAccountBaisc> dataList, List<Pe ...@@ -313,22 +313,22 @@ private PerSheet ComputeNurse(IEnumerable<PerDataAccountBaisc> dataList, List<Pe
foreach (var dept in dataList.Where(t => t.UnitType == 2)) foreach (var dept in dataList.Where(t => t.UnitType == 2))
{ {
if (string.IsNullOrEmpty(dept.DoctorAccountingUnit)) continue; if (string.IsNullOrEmpty(dept.AccountingUnit)) continue;
var econNurse = economicData.FirstOrDefault(t => t.UnitType == "护理组" && t.AccountingUnit == dept.Department); var econNurse = economicData.FirstOrDefault(t => t.UnitType == "护理组" && t.AccountingUnit == dept.Department);
var workNurse = workloadData.FirstOrDefault(t => t.UnitType == "护理组" && t.AccountingUnit == dept.Department); var workNurse = workloadData.FirstOrDefault(t => t.UnitType == "护理组" && t.AccountingUnit == dept.Department);
var nurse = new PerDataAccountNurse var nurse = new PerDataAccountNurse
{ {
AccountingUnit = dept.DoctorAccountingUnit, AccountingUnit = dept.AccountingUnit,
Department = dept.Department, Department = dept.Department,
Number = dept.DoctorNumber + dept.DoctorDirectorNumber, Number = dept.Number + dept.ManagerNumber,
BasicFactor = dept.DoctorBasicFactor, BasicFactor = dept.BasicFactor,
SlopeFactor = dept.DoctorSlopeFactor, SlopeFactor = dept.SlopeFactor,
OtherPerfor1 = dept.DoctorOtherPerfor1, OtherPerfor1 = dept.OtherPerfor1,
OtherPerfor2 = dept.DoctorOtherPerfor2, OtherPerfor2 = dept.OtherPerfor2,
Extra = dept.DoctorExtra, Extra = dept.Extra,
ScoringAverage = dept.DoctorScoringAverage == 0m ? 1 : dept.DoctorScoringAverage, ScoringAverage = dept.ScoringAverage == 0m ? 1 : dept.ScoringAverage,
AdjustFactor = dept.DoctorAdjustFactor == 0m ? 1 : dept.DoctorAdjustFactor, AdjustFactor = dept.AdjustFactor == 0m ? 1 : dept.AdjustFactor,
Income = econNurse?.CellValue ?? 0, Income = econNurse?.CellValue ?? 0,
WorkloadFee = workNurse?.CellValue ?? 0, WorkloadFee = workNurse?.CellValue ?? 0,
}; };
......
performance/Performance.Services/AllotCompute/ResultComputeService.cs
...@@ -55,7 +55,7 @@ public List<res_baiscnorm> Compute(per_allot allot, PerExcel excel, List<PerShee ...@@ -55,7 +55,7 @@ public List<res_baiscnorm> Compute(per_allot allot, PerExcel excel, List<PerShee
var computResult = computeDirector.Compute(computeEmployees, accountbasicList, allot); var computResult = computeDirector.Compute(computeEmployees, accountbasicList, allot);
//计算 绩效标准 基数（科主任、副主任、护士长 =>> 平均值） //计算 绩效标准 基数（科主任、副主任、护士长 =>> 平均值）
List<res_baiscnorm> baiscnormList = new List<res_baiscnorm>(); List<res_baiscnorm> baiscnormList = new List<res_baiscnorm>();
baiscNormService.ComputeAvg(baiscnormList, accountbasicList, computResult, empolyeeList); baiscNormService.ComputeAvg(baiscnormList, accountbasicList, computResult);
baiscNormService.DocterNurseBaiscnorm(baiscnormList, accountbasicList, perSheets, empolyeeList); baiscNormService.DocterNurseBaiscnorm(baiscnormList, accountbasicList, perSheets, empolyeeList);
var computResult2 = computeDirector.Compute(computeEmployees, allot, baiscnormList); var computResult2 = computeDirector.Compute(computeEmployees, allot, baiscnormList);
......
performance/Performance.Services/ExtractService.cs
...@@ -333,25 +333,17 @@ private bool WriteExcel(string newpath, string originalPath, List<PerSheet> shee ...@@ -333,25 +333,17 @@ private bool WriteExcel(string newpath, string originalPath, List<PerSheet> shee
var importRow = importSheet.CreateRow(maxHeaderRowNumber + i + 1); var importRow = importSheet.CreateRow(maxHeaderRowNumber + i + 1);
Dictionary<string, Func<PerDataAccountBaisc, object>> keyValues = new Dictionary<string, Func<PerDataAccountBaisc, object>> Dictionary<string, Func<PerDataAccountBaisc, object>> keyValues = new Dictionary<string, Func<PerDataAccountBaisc, object>>
{ {
{ "核算单元（医生组）", (t) => t.DoctorAccountingUnit }, { "核算单元类型", (t) => EnumHelper.GetDescription((UnitType)t.UnitType) },
{ "核算单元（护理组）", (t) => t.NurseAccountingUnit }, { "核算单元", (t) => t.AccountingUnit },
{ "科室名称", (t) => t.Department }, { "科室名称", (t) => t.Department },
{ "医生组核算单元医生数量", (t) => t.DoctorNumber }, { "医生组核算单元医生数量", (t) => t.Number },
{ "医生组基础系数", (t) => t.DoctorBasicFactor }, { "医生组基础系数", (t) => t.BasicFactor },
{ "医生组倾斜系数", (t) => t.DoctorSlopeFactor }, { "医生组倾斜系数", (t) => t.SlopeFactor },
{ "医生组其他绩效1", (t) => t.DoctorOtherPerfor1 }, { "医生组其他绩效1", (t) => t.OtherPerfor1 },
{ "医生组考核得分率", (t) => t.DoctorScoringAverage }, { "医生组考核得分率", (t) => t.ScoringAverage },
{ "医生组医院奖罚", (t) => t.DoctorExtra }, { "医生组医院奖罚", (t) => t.Extra },
{ "医生组其他绩效2", (t) => t.DoctorOtherPerfor2 }, { "医生组其他绩效2", (t) => t.OtherPerfor2 },
{ "医生组调节系数", (t) => t.DoctorAdjustFactor }, { "医生组调节系数", (t) => t.AdjustFactor },
{ "护理组核算单元护士数量", (t) => t.NurseNumber },
{ "护理组基础系数", (t) => t.NurseBasicFactor },
{ "护理组倾斜系数", (t) => t.NurseSlopeFactor },
{ "护理组其他绩效1", (t) => t.NurseOtherPerfor1 },
{ "护理组考核得分率", (t) => t.NurseScoringAverage },
{ "护理组医院奖罚", (t) => t.NurseExtra },
{ "护理组其他绩效2", (t) => t.NurseOtherPerfor2 },
{ "护理组调节系数", (t) => t.NurseAdjustFactor },
}; };
foreach (var item in keyValues.Keys) foreach (var item in keyValues.Keys)
{ {
......
performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadDeptAccountingt.cs
...@@ -33,20 +33,20 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader) ...@@ -33,20 +33,20 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
PerDataAccountBaisc unifyUnit = new PerDataAccountBaisc(); PerDataAccountBaisc unifyUnit = new PerDataAccountBaisc();
unifyUnit.RowNumber = r; unifyUnit.RowNumber = r;
unifyUnit.UnitType = UnitType(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元类型").PointCell)?.ToString()); unifyUnit.UnitType = UnitType(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元类型").PointCell)?.ToString());
unifyUnit.DoctorAccountingUnit = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元").PointCell)?.ToString(); unifyUnit.AccountingUnit = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元").PointCell)?.ToString();
unifyUnit.Department = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "科室名称").PointCell)?.ToString(); unifyUnit.Department = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "科室名称").PointCell)?.ToString();
unifyUnit.DoctorDirectorNumber = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元科主任/护士长数量").PointCell)?.ToString()); unifyUnit.ManagerNumber = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元科主任/护士长数量").PointCell)?.ToString());
unifyUnit.DoctorNumber = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元人员数量").PointCell)?.ToString()); unifyUnit.Number = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元人员数量").PointCell)?.ToString());
unifyUnit.DoctorBasicFactor = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "预算比例").PointCell)?.ToString()); unifyUnit.BasicFactor = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "预算比例").PointCell)?.ToString());
unifyUnit.DoctorSlopeFactor = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "倾斜系数").PointCell)?.ToString()); unifyUnit.SlopeFactor = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "倾斜系数").PointCell)?.ToString());
unifyUnit.DoctorScale = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "规模绩效系数").PointCell)?.ToString()); unifyUnit.Scale = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "规模绩效系数").PointCell)?.ToString());
unifyUnit.DoctorEffic = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "效率绩效系数").PointCell)?.ToString()); unifyUnit.Effic = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "效率绩效系数").PointCell)?.ToString());
unifyUnit.DoctorGrant = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "管理绩效发放系数").PointCell)?.ToString()); unifyUnit.Grant = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "管理绩效发放系数").PointCell)?.ToString());
unifyUnit.DoctorOtherPerfor1 = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "其他绩效1").PointCell)?.ToString()); unifyUnit.OtherPerfor1 = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "其他绩效1").PointCell)?.ToString());
unifyUnit.DoctorOtherPerfor2 = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "其他绩效2").PointCell)?.ToString()); unifyUnit.OtherPerfor2 = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "其他绩效2").PointCell)?.ToString());
unifyUnit.DoctorExtra = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "医院奖罚").PointCell)?.ToString()); unifyUnit.Extra = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "医院奖罚").PointCell)?.ToString());
unifyUnit.DoctorScoringAverage = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "考核得分率").PointCell)?.ToString()); unifyUnit.ScoringAverage = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "考核得分率").PointCell)?.ToString());
unifyUnit.DoctorAdjustFactor = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "调节系数").PointCell)?.ToString()); unifyUnit.AdjustFactor = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "调节系数").PointCell)?.ToString());
//unifyUnit.NurseHeadNumber = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元护士长数量" && p.Parent.CellValue == "护理组").PointCell)?.ToString()); //unifyUnit.NurseHeadNumber = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元护士长数量" && p.Parent.CellValue == "护理组").PointCell)?.ToString());
//unifyUnit.NurseNumber = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元护士数量" && p.Parent.CellValue == "护理组").PointCell)?.ToString()); //unifyUnit.NurseNumber = ConvertHelper.To<decimal>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "核算单元护士数量" && p.Parent.CellValue == "护理组").PointCell)?.ToString());
......
performance/Performance.Services/SheetSevice.cs
...@@ -349,8 +349,8 @@ private void AccountBaiscExport(int sheetID, SheetExportResponse response) ...@@ -349,8 +349,8 @@ private void AccountBaiscExport(int sheetID, SheetExportResponse response)
if (list != null && list.Count() > 0) if (list != null && list.Count() > 0)
{ {
var row1 = new Row(0); var row1 = new Row(0);
row1.Data.Add(new Cell(1, "核算单元（医生组）", 2, 1, false, false)); row1.Data.Add(new Cell(1, "核算单元类型", 2, 1, false, false));
row1.Data.Add(new Cell(2, "核算单元（护理组）", 2, 1, false, false)); row1.Data.Add(new Cell(2, "核算单元", 2, 1, false, false));
row1.Data.Add(new Cell(3, "科室", 2, 1, false, false)); row1.Data.Add(new Cell(3, "科室", 2, 1, false, false));
row1.Data.Add(new Cell(4, "医生组", 1, 8, false, false)); row1.Data.Add(new Cell(4, "医生组", 1, 8, false, false));
row1.Data.Add(new Cell(12, "护士组", 1, 8, false, false)); row1.Data.Add(new Cell(12, "护士组", 1, 8, false, false));
...@@ -381,7 +381,7 @@ private void AccountBaiscExport(int sheetID, SheetExportResponse response) ...@@ -381,7 +381,7 @@ private void AccountBaiscExport(int sheetID, SheetExportResponse response)
var item = list.ElementAt(i); var item = list.ElementAt(i);
var rowbody = new Row(i); var rowbody = new Row(i);
rowbody.Data.Add(new Cell(1, item.DoctorAccountingUnit, 1, 1, false, false)); rowbody.Data.Add(new Cell(1, item.DoctorAccountingUnit, 1, 1, false, false));
rowbody.Data.Add(new Cell(2, item.NurseAccountingUnit, 1, 1, false, false)); rowbody.Data.Add(new Cell(2, item.DoctorAccountingUnit, 1, 1, false, false));
rowbody.Data.Add(new Cell(3, item.Department, 1, 1, false, false)); rowbody.Data.Add(new Cell(3, item.Department, 1, 1, false, false));
rowbody.Data.Add(new Cell(4, item.DoctorNumber, 1, 1, false, true)); rowbody.Data.Add(new Cell(4, item.DoctorNumber, 1, 1, false, true));
...@@ -392,15 +392,6 @@ private void AccountBaiscExport(int sheetID, SheetExportResponse response) ...@@ -392,15 +392,6 @@ private void AccountBaiscExport(int sheetID, SheetExportResponse response)
rowbody.Data.Add(new Cell(9, item.DoctorExtra, 1, 1, false, true)); rowbody.Data.Add(new Cell(9, item.DoctorExtra, 1, 1, false, true));
rowbody.Data.Add(new Cell(10, item.DoctorScoringAverage, 1, 1, false, true)); rowbody.Data.Add(new Cell(10, item.DoctorScoringAverage, 1, 1, false, true));
rowbody.Data.Add(new Cell(11, item.DoctorAdjustFactor, 1, 1, false, true)); rowbody.Data.Add(new Cell(11, item.DoctorAdjustFactor, 1, 1, false, true));
rowbody.Data.Add(new Cell(12, item.NurseNumber, 1, 1, false, true));
rowbody.Data.Add(new Cell(13, item.NurseBasicFactor, 1, 1, false, true));
rowbody.Data.Add(new Cell(14, item.NurseSlopeFactor, 1, 1, false, true));
rowbody.Data.Add(new Cell(15, item.NurseOtherPerfor1, 1, 1, false, true));
rowbody.Data.Add(new Cell(16, item.NurseOtherPerfor2, 1, 1, false, true));
rowbody.Data.Add(new Cell(17, item.NurseExtra, 1, 1, false, true));
rowbody.Data.Add(new Cell(18, item.NurseScoringAverage, 1, 1, false, true));
rowbody.Data.Add(new Cell(19, item.NurseAdjustFactor, 1, 1, false, true));
response.Row.Add(rowbody); response.Row.Add(rowbody);
} }
} }
......
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