Skip to content

P
performance
Commit 8a353df6 by ruyun.zhang
Options

科室详情显示设置接口

parent 3f959877
Showing with 186 additions and 76 deletions
performance/Performance.Api/Controllers/ComputeController.cs
......@@ -168,59 +168,41 @@ public ApiResponse<List<DeptResponse>> GetAdminPerformance([FromBody] ComputerRe
}
/// <summary>
/// 科室绩效详情
/// 科室绩效详情显示隐藏设置--加载
/// </summary>
/// <param name="request"></param>
/// <param name="allotId"></param>
/// <returns></returns>
[Route("unite/deptdetail")]
[Route("unite/deptdetail/setting/get")]
[HttpPost]
public ApiResponse UniteDeptDetail([FromBody] UniteDeptDetailRequest request)
{
/*
[
{
"type":"1",
"title":"护理组工作量绩效测算表",
"items":[
public ApiResponse GetUniteDeptDetailSetting([FromQuery] int allotId)
{
"项目":"柳州市医保工作量（48H以上）",
"数量":"123",
"系数":"40",
"工作量倾斜":"1",
"金额":"23423"
}
]
},
{
"type":"1",
"title":"护理组工作量绩效测算表",
"items":[
{
"项目":"柳州市医保工作量（48H以上）",
"数量":"123",
"系数":"40",
"工作量倾斜":"1",
"金额":"23423"
var response = _computeService.GetUniteDeptDetailSetting(allotId);
return new ApiResponse(ResponseType.OK, response);
}
]
},
{
"type":"1",
"title":"护理组工作量绩效测算表",
"items":[
/// <summary>
/// 科室绩效详情显示隐藏设置--保存
/// </summary>
/// <param name="allotId"></param>
/// <param name="request"></param>
/// <returns></returns>
[Route("unite/deptdetail/setting/save")]
[HttpPost]
public ApiResponse SaveUniteDeptDetailSetting([FromQuery] int allotId, [FromBody] UniteDeptSetting request)
{
"项目":"柳州市医保工作量（48H以上）",
"数量":"123",
"系数":"40",
"工作量倾斜":"1",
"金额":"23423"
}
]
_computeService.SaveUniteDeptDetailSetting(allotId, request);
return new ApiResponse(ResponseType.OK, "保存成功");
}
]
*/
/// <summary>
/// 科室绩效详情
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[Route("unite/deptdetail")]
[HttpPost]
public ApiResponse UniteDeptDetail([FromBody] UniteDeptDetailRequest request)
{
if (!Enum.TryParse(request.UnitType, ignoreCase: true, out UnitType unitType))
return new ApiResponse(ResponseType.ParameterError, "核算组别错误");
var userid = _claim.GetUserId();
......
performance/Performance.Api/wwwroot/Performance.Api.xml
......@@ -1045,6 +1045,21 @@
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ComputeController.GetUniteDeptDetailSetting(System.Int32)">
<summary>
科室绩效详情显示隐藏设置
</summary>
<param name="allotId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ComputeController.SaveUniteDeptDetailSetting(System.Int32,Performance.DtoModels.UniteDeptSetting)">
<summary>
科室绩效详情显示隐藏设置
</summary>
<param name="allotId"></param>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ComputeController.UniteDeptDetail(Performance.DtoModels.UniteDeptDetailRequest)">
<summary>
科室绩效详情
......
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
......@@ -85,6 +85,9 @@
<member name="P:Performance.EntityModels.PerformanceDbContext.cof_cmi">
<summary> </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.cof_dept_detail">
<summary> </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.cof_depttype">
<summary> 科室类型 </summary>
</member>
......@@ -1850,6 +1853,31 @@
可是分类
</summary>
</member>
<member name="T:Performance.EntityModels.cof_dept_detail">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.cof_dept_detail.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.cof_dept_detail.AllotId">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.cof_dept_detail.Settings">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.cof_dept_detail.CreateTime">
<summary>
</summary>
</member>
<member name="T:Performance.EntityModels.cof_director">
<summary>
规模绩效、效率绩效计算系数配置
......
performance/Performance.DtoModels/Enum.cs
......@@ -200,21 +200,36 @@ public enum Type
}
public enum Title
{
[Description("整数")] 业绩分值 = 2100,
[Description("百分比")] 预算比例 = 2110,
[Description("整数")] 业绩绩效 = 2120,
[Description("整数")] 工作量绩效 = 2130,
[Description("整数")] 考核前其他绩效 = 2140,
[Description("整数")] 考核前绩效 = 2150,
[Description("百分比")] 考核得分率 = 2160,
[Description("整数")] 药占比奖罚 = 2170,
[Description("整数")] 材料占比奖罚 = 2180,
[Description("整数")] 医院奖罚 = 2190,
[Description("整数")] 考核后绩效 = 2200,
[Description("整数")] 考核后其他绩效 = 2210,
[Description("百分比")] 调节系数 = 2220,
[Description("整数")] 调节后其他绩效 = 2230,
[Description("整数")] 实发绩效 = 2240,
业绩分值 = 2100,
预算比例 = 2110,
业绩绩效 = 2120,
工作量绩效 = 2130,
考核前其他绩效 = 2140,
考核前绩效 = 2150,
考核得分率 = 2160,
药占比奖罚 = 2170,
材料占比奖罚 = 2180,
医院奖罚 = 2190,
考核后绩效 = 2200,
考核后其他绩效 = 2210,
调节系数 = 2220,
调节后其他绩效 = 2230,
实发绩效 = 2240,
}
public enum DisplayRule
{
始终显示,
下发显示,
}
public enum Format
{
无,
整数,
一位小数,
两位小数,
三位小数,
四位小数,
百分比,
}
}
}
performance/Performance.DtoModels/Response/UniteDeptDetailResponse.cs
......@@ -12,20 +12,6 @@ public class UniteDeptDetailResponse
}
public class DeptDetailItem
{
//public DeptDetailItem(int type, string title, decimal total, string remark, int sort)
// : this(type, title, total, remark, sort, new List<Dictionary<string, object>>())
//{
//}
//public DeptDetailItem(int type, string title, decimal total, string remark, int sort, List<Dictionary<string, object>> items)
//{
// Type = type;
// Title = title;
// Total = total;
// Remark = remark;
// Sort = sort;
// Items = items;
//}
public int Type { get; set; }
public string Title { get; set; }
public decimal Total { get; set; }
......
performance/Performance.DtoModels/UniteDeptSetting.cs 0 → 100644
using System;
using System.Collections.Generic;
namespace Performance.DtoModels
{
public class UniteDeptSetting
{
public List<UniteDeptDetailItem> DetailItems { get; set; } = new List<UniteDeptDetailItem>();
}
public class UniteDeptDetailItem
{
public int Type { get; set; }
public int SheetType { get; set; }
public string Title { get; set; }
public string Remark { get; set; }
public string Format { get; set; }
public int Sort { get; set; }
public string Display { get; set; }
public List<UniteDeptDetailItem> Items { get; set; }
}
}
performance/Performance.EntityModels/Context/PerformanceDbContext.cs
......@@ -69,6 +69,8 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
public virtual DbSet<cof_check> cof_check { get; set; }
/// <summary> </summary>
public virtual DbSet<cof_cmi> cof_cmi { get; set; }
/// <summary> </summary>
public virtual DbSet<cof_dept_detail> cof_dept_detail { get; set; }
/// <summary> 科室类型 </summary>
public virtual DbSet<cof_depttype> cof_depttype { get; set; }
/// <summary> 规模绩效、效率绩效计算系数配置 </summary>
......
performance/Performance.EntityModels/Entity/cof_dept_detail.cs 0 → 100644
//-----------------------------------------------------------------------
// <copyright file=" cof_dept_detail.cs">
// * FileName: cof_dept_detail.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels
{
/// <summary>
///
/// </summary>
[Table("cof_dept_detail")]
public class cof_dept_detail
{
/// <summary>
///
/// </summary>
[Key]
public int Id { get; set; }
/// <summary>
///
/// </summary>
public int AllotId { get; set; }
/// <summary>
///
/// </summary>
public string Settings { get; set; }
/// <summary>
///
/// </summary>
public DateTime CreateTime { get; set; }
}
}
performance/Performance.Repository/Repository/PerforCofDeptDetailRepository.cs 0 → 100644
//-----------------------------------------------------------------------
// <copyright file="cof_dept_detail.cs">
// * FileName: cof_dept_detail.cs
// </copyright>
//-----------------------------------------------------------------------
using Performance.EntityModels;
namespace Performance.Repository
{
/// <summary>
/// cof_cmi Repository
/// </summary>
public partial class PerforCofDeptDetailRepository : PerforRepository<cof_dept_detail>
{
public PerforCofDeptDetailRepository(PerformanceDbContext context) : base(context)
{
}
}
}
performance/Performance.Services/ComputeService.cs
......@@ -38,6 +38,7 @@ public partial class ComputeService : IAutoInjection
private readonly PerforCofaccountingRepository _cofaccountingRepository;
private readonly PerforCofaliasRepository cofaliasRepository;
private readonly PerforReportRepository reportRepository;
private readonly PerforCofDeptDetailRepository _perforCofDeptDetailRepository;
public ComputeService(
IMapper mapper,
......@@ -62,7 +63,8 @@ public partial class ComputeService : IAutoInjection
PerforCofworkitemRepository cofworkitemRepository,
PerforCofaccountingRepository cofaccountingRepository,
PerforCofaliasRepository cofaliasRepository,
PerforReportRepository reportRepository)
PerforReportRepository reportRepository,
PerforCofDeptDetailRepository perforCofDeptDetailRepository)
{
_mapper = mapper;
_userRepository = userRepository;
......@@ -87,6 +89,7 @@ public partial class ComputeService : IAutoInjection
_cofaccountingRepository = cofaccountingRepository;
this.cofaliasRepository = cofaliasRepository;
this.reportRepository = reportRepository;
_perforCofDeptDetailRepository = perforCofDeptDetailRepository;
}
public int IsShowManage(int allotId)
......@@ -1735,7 +1738,7 @@ public DeptDataDetails GetDoctorDetail(int computeId)
var data = _perforImDataRepository.GetEntities(t => t.AllotID == resCompute.AllotID && sheets.Select(s => s.ID).Contains(t.SheetID.Value)
&& t.JobNumber == resCompute.JobNumber) ?? new List<im_data>();
data = data.Where(t => t.UnitType != null && Enum.IsDefined(typeof(UnitType), t.UnitType ) == true && ((UnitType)t.UnitType).ToString() == resCompute.UnitType && t.AccountingUnit == resCompute.AccountingUnit).ToList();
data = data.Where(t => t.UnitType != null && Enum.IsDefined(typeof(UnitType), t.UnitType) == true && ((UnitType)t.UnitType).ToString() == resCompute.UnitType && t.AccountingUnit == resCompute.AccountingUnit).ToList();
foreach (var sheet in sheets)
{
......
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