Skip to content

P
performance
Commit 9006f2d6 by ruyun.zhang
Options

Merge branch '宁海' into develop

parents 647402d4 8ca43d72
Showing with 57 additions and 24 deletions
performance/Performance.Api/Performance.Api.csproj
......@@ -12,27 +12,37 @@
</PropertyGroup>
<PropertyGroup>
<!-- 将当前时间转换成23.4.25.4566格式作为版本号的一部分 -->
<VersionSuffix>$([System.DateTime]::UtcNow.ToString(yy.M.d.mmff))</VersionSuffix>
<AssemblyVersion Condition=" '$(VersionSuffix)' == '' ">0.0.0.1</AssemblyVersion>
<AssemblyVersion Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)</AssemblyVersion>
<Version Condition=" '$(VersionSuffix)' == '' ">0.0.1.0</Version>
<Version Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)</Version>
<Product>医院绩效管理平台</Product>
</PropertyGroup>
<PropertyGroup>
<PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>
<UserSecretsId>e732666b-5531-4cd8-b713-2fe3db31126c</UserSecretsId>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Files\**" />
<Content Remove="Files\**" />
<EmbeddedResource Remove="Files\**" />
<None Remove="Files\**" />
<Compile Remove="Files\**" />
<Content Remove="Files\**" />
<EmbeddedResource Remove="Files\**" />
<None Remove="Files\**" />
</ItemGroup>
<ItemGroup>
<Content Include="secret.key">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="secret.key">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="XC.RSAUtil" Version="1.3.6" />
<PackageReference Include="XC.RSAUtil" Version="1.3.6" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Performance.DtoModels\Performance.DtoModels.csproj" />
<ProjectReference Include="..\Performance.Services\Performance.Services.csproj" />
......@@ -46,16 +56,16 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Performance.Api.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Performance.DtoModels.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Performance.DtoModels.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Performance.EntityModels.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
......@@ -70,7 +80,7 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Template\医院人员绩效模板.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Template\医院绩效模板%28无执行科室%29.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
......@@ -94,16 +104,18 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Template\工作量数据导入模板.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Folder Include="wwwroot\" />
<Folder Include="wwwroot\" />
</ItemGroup>
<ProjectExtensions>
<VisualStudio><UserProperties appsettings_1json__JSONSchema="" appsettings_1localhost_1json__JsonSchema="https://cdn.jsdelivr.net/gh/roadrunner-server/roadrunner@latest/schemas/config/2.0.schema.json" /></VisualStudio>
<VisualStudio>
<UserProperties appsettings_1json__JSONSchema="" appsettings_1localhost_1json__JsonSchema="https://cdn.jsdelivr.net/gh/roadrunner-server/roadrunner@latest/schemas/config/2.0.schema.json" />
</VisualStudio>
</ProjectExtensions>
</Project>
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
......@@ -3917,6 +3917,11 @@
</summary>
</member>
<member name="P:Performance.DtoModels.DeptResponse.Code">
<summary>
组别编码
</summary>
</member>
<member name="P:Performance.DtoModels.DeptResponse.UnitName">
<summary>
分组名称（医生、护士）
......
performance/Performance.DtoModels/Response/DeptResponse.cs
......@@ -20,7 +20,10 @@ public class DeptResponse
///
/// </summary>
public Nullable<int> SheetID { get; set; }
/// <summary>
/// 组别编码
/// </summary>
public string Code { get; set; }
public int UnitType { get; set; }
/// <summary>
......
performance/Performance.Repository/PerforPeremployeeRepository.cs
......@@ -83,7 +83,7 @@ public DtoModels.Comparison<view_check_emp> CheckEmployeeRealGiveFeeDiff(Compari
";
var queryCount = @"
SELECT COUNT(DISTINCT HospitalId,Year,Month,AllotID,ComputeId,UnitType,AccountingUnit,JobNumber) FROM (
SELECT COUNT(0) FROM (
SELECT * FROM view_check_emp WHERE AllotId = @allotId
) TAB
WHERE if(@searchQuery='','',AccountingUnit) LIKE @parm OR if(@searchQuery='','',JobNumber) LIKE @parm OR if(@searchQuery='','',EmployeeName) LIKE @parm
......
performance/Performance.Services/ComputeService.cs
......@@ -36,6 +36,7 @@ public class ComputeService : IAutoInjection
private readonly PerforPeremployeeRepository perforPeremployeeRepository;
private readonly PerforPerapramounthideRepository _hideRepository;
private readonly PerforCofworkitemRepository cofworkitemRepository;
private readonly PerforCofaccountingRepository _cofaccountingRepository;
private readonly PerforCofaliasRepository cofaliasRepository;
private readonly PerforReportRepository reportRepository;
......@@ -59,6 +60,7 @@ public class ComputeService : IAutoInjection
PerforPeremployeeRepository perforPeremployeeRepository,
PerforPerapramounthideRepository hideRepository,
PerforCofworkitemRepository cofworkitemRepository,
PerforCofaccountingRepository cofaccountingRepository,
PerforCofaliasRepository cofaliasRepository,
PerforReportRepository reportRepository)
{
......@@ -81,6 +83,7 @@ public class ComputeService : IAutoInjection
this.perforPeremployeeRepository = perforPeremployeeRepository;
_hideRepository = hideRepository;
this.cofworkitemRepository = cofworkitemRepository;
_cofaccountingRepository = cofaccountingRepository;
this.cofaliasRepository = cofaliasRepository;
this.reportRepository = reportRepository;
}
......@@ -314,10 +317,18 @@ public List<DeptResponse> GetOtherPerformance(int allotId)
public List<DeptResponse> GetGroupPerformance(int allotId, List<int> group)
{
var unitType = group;
var list = perforResaccountRepository.GetEntities(t => unitType.Contains(t.UnitType.Value) && t.AllotID == allotId)?.OrderBy(t => t.UnitType).ThenByDescending(t => t.AccountingUnit);
List<DeptResponse> Performance = _mapper.Map<List<DeptResponse>>(list);
Performance?.ForEach(t => t.UnitName = ((UnitType)t.UnitType).ToString());
return Performance;
var list = perforResaccountRepository.GetEntities(t => unitType.Contains(t.UnitType.Value) && t.AllotID == allotId);
if (list?.Any() != true) return new List<DeptResponse>();
var cofaccounting = _cofaccountingRepository.GetEntities(g => g.AllotId == allotId);
List<DeptResponse> performance = _mapper.Map<List<DeptResponse>>(list);
performance?.ForEach(t =>
{
t.UnitName = ((UnitType)t.UnitType).ToString();
t.Code = cofaccounting.FirstOrDefault(w => w.UnitType == t.UnitName && w.AccountingUnit == t.AccountingUnit)?.Code ?? "";
});
performance = performance?.OrderBy(t => t.Code).ThenBy(t => t.UnitType).ThenByDescending(t => t.AccountingUnit).ToList();
return performance;
}
/// <summary>
/// 返回行政科室绩效列表
......
performance/Performance.Services/RedistributionService.cs
......@@ -479,7 +479,7 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
#region 添加参考人均 lcr:参考人均那里直接取4.1的人均绩效
// 添加参考人均（二次分配审核时，提示业务中层测算表的基础绩效或实际人均）
var refAvg = 0m;
decimal refAvg = 0m, refNum = 0m;
if (Enum.TryParse(typeof(UnitType), second.UnitType, true, out object unittype))
{
// 优先取 业务中层实际人均绩效 否则 取 科室人均
......@@ -488,8 +488,10 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
var rescompute = _resaccountRepository.GetEntity(w => w.AllotID == allot.ID && w.AccountingUnit == second.Department && w.UnitType == (int)unittype);
var avg = (empolyee != null && empolyee.FitPeopleValue.HasValue) ? empolyee.FitPeopleValue : rescompute?.Avg ?? 0;
refAvg = avg ?? 0;
refNum = rescompute?.Number ?? 0;
}
head.AddOrUpdate("RefAvg", Math.Round(refAvg, 0, MidpointRounding.AwayFromZero));
head.AddOrUpdate("RefNum", refNum);
#endregion
// 横向 纵向 特有顶部信息
......
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