Skip to content

P
performance
Commit 65c06afe by ruyun.zhang@suvalue.com
Options

Merge branch 'release/v20210709功能分支合并' into develop

parents 97a18f72 1ecf3f18
Showing with 1348 additions and 69 deletions
performance/Performance.Api/Controllers/AllotController.cs
...@@ -34,6 +34,7 @@ public class AllotController : Controller ...@@ -34,6 +34,7 @@ public class AllotController : Controller
private ILogger<AllotController> _logger; private ILogger<AllotController> _logger;
private ClaimService _claim; private ClaimService _claim;
private LogManageService _logManageService; private LogManageService _logManageService;
private readonly CostTransferService costTransferService;
private IBackgroundTaskQueue _backgroundTaskQueue; private IBackgroundTaskQueue _backgroundTaskQueue;
private IServiceScopeFactory _serviceScopeFactory; private IServiceScopeFactory _serviceScopeFactory;
...@@ -45,7 +46,8 @@ public class AllotController : Controller ...@@ -45,7 +46,8 @@ public class AllotController : Controller
IBackgroundTaskQueue backgroundTaskQueue, IBackgroundTaskQueue backgroundTaskQueue,
IServiceScopeFactory serviceScopeFactory, IServiceScopeFactory serviceScopeFactory,
ClaimService claim, ClaimService claim,
LogManageService logManageService) LogManageService logManageService,
CostTransferService costTransferService)
{ {
_allotService = allotService; _allotService = allotService;
_resultComputeService = resultComputeService; _resultComputeService = resultComputeService;
...@@ -53,6 +55,7 @@ public class AllotController : Controller ...@@ -53,6 +55,7 @@ public class AllotController : Controller
_evn = evn; _evn = evn;
_claim = claim; _claim = claim;
_logManageService = logManageService; _logManageService = logManageService;
this.costTransferService = costTransferService;
_configService = configService; _configService = configService;
_backgroundTaskQueue = backgroundTaskQueue; _backgroundTaskQueue = backgroundTaskQueue;
_serviceScopeFactory = serviceScopeFactory; _serviceScopeFactory = serviceScopeFactory;
...@@ -96,6 +99,8 @@ public ApiResponse Insert([FromBody] AllotRequest request) ...@@ -96,6 +99,8 @@ public ApiResponse Insert([FromBody] AllotRequest request)
var userId = _claim.GetUserId(); var userId = _claim.GetUserId();
var result = _allotService.InsertAllot(request, userId); var result = _allotService.InsertAllot(request, userId);
_configService.Copy(result); _configService.Copy(result);
//带出上月划拨记录
costTransferService.IntoLastTiemData(request.HospitalId.Value, result.ID);
return new ApiResponse(ResponseType.OK, result); return new ApiResponse(ResponseType.OK, result);
} }
...@@ -421,6 +426,8 @@ public ApiResponse Issued([FromBody] AllotRequest request) ...@@ -421,6 +426,8 @@ public ApiResponse Issued([FromBody] AllotRequest request)
_allotService.UpdateAllotStates(allot.ID, (int)AllotStates.GenerateSucceed, EnumHelper.GetDescription(AllotStates.GenerateSucceed)); _allotService.UpdateAllotStates(allot.ID, (int)AllotStates.GenerateSucceed, EnumHelper.GetDescription(AllotStates.GenerateSucceed));
// 科室下发 // 科室下发
_resultComputeService.GenerateSecondAllot(allot); _resultComputeService.GenerateSecondAllot(allot);
//绩效划拨，下发驳回
costTransferService.RejectedApplicat(allot.ID);
return new ApiResponse(ResponseType.OK); return new ApiResponse(ResponseType.OK);
} }
......
performance/Performance.Api/Controllers/ConfigController.cs
using FluentValidation.AspNetCore; using FluentValidation.AspNetCore;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ApiExplorer;
using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Performance.DtoModels; using Performance.DtoModels;
using Performance.DtoModels.AppSettings;
using Performance.EntityModels; using Performance.EntityModels;
using Performance.Infrastructure; using Performance.Infrastructure;
using Performance.Services; using Performance.Services;
using Performance.Services.ExtractExcelService;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
namespace Performance.Api.Controllers namespace Performance.Api.Controllers
{ {
[Route("api/[controller]")] [Route("api/[controller]")]
public class ConfigController : Controller public class ConfigController : Controller
{ {
private ConfigService _configService; private readonly ConfigService _configService;
private AllotService _allotService; private readonly AllotService _allotService;
public ConfigController(ConfigService configService, AllotService allotService) private readonly DictionaryService _dictionaryService;
public ConfigController(ConfigService configService, AllotService allotService, DictionaryService dictionaryService)
{ {
_configService = configService; _configService = configService;
_allotService = allotService; _allotService = allotService;
_dictionaryService = dictionaryService;
} }
#region 弃用 #region 弃用
...@@ -673,6 +675,7 @@ public ApiResponse BatchAccountingStructrue([FromRoute] int allotId) ...@@ -673,6 +675,7 @@ public ApiResponse BatchAccountingStructrue([FromRoute] int allotId)
/// 核算单元及组别批量添加 /// 核算单元及组别批量添加
/// </summary> /// </summary>
/// <param name="allotId"></param> /// <param name="allotId"></param>
/// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[Route("BatchSaveAccounting/{allotId}")] [Route("BatchSaveAccounting/{allotId}")]
[HttpPost] [HttpPost]
...@@ -725,7 +728,9 @@ public ApiResponse GetHrpDeptHands([FromRoute] int hospitalId, int allotId) ...@@ -725,7 +728,9 @@ public ApiResponse GetHrpDeptHands([FromRoute] int hospitalId, int allotId)
/// <summary> /// <summary>
/// 保存HRP人员科室 /// 保存HRP人员科室
/// </summary> /// </summary>
/// <param name=""></param> /// <param name="hospitalId"></param>
/// <param name="allotId"></param>
/// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[Route("savehrpdept/{hospitalId}/allot/{allotId}")] [Route("savehrpdept/{hospitalId}/allot/{allotId}")]
[HttpPost] [HttpPost]
...@@ -738,6 +743,21 @@ public ApiResponse SaveHrpDept(int hospitalId, int allotId, [FromBody] SaveColle ...@@ -738,6 +743,21 @@ public ApiResponse SaveHrpDept(int hospitalId, int allotId, [FromBody] SaveColle
_configService.SaveDepttypeHands(hospitalId, allotId, request); _configService.SaveDepttypeHands(hospitalId, allotId, request);
return new ApiResponse(ResponseType.OK); return new ApiResponse(ResponseType.OK);
} }
/// <summary>
/// 校正HRP人员的科室信息
/// </summary>
/// <param name="allotId"></param>
/// <returns></returns>
[Route("standardhrpdept/{allotId}")]
[HttpPost]
public ApiResponse StandardHrpDept(int allotId)
{
if (allotId <= 0)
return new ApiResponse(ResponseType.Fail, "参数错误", "allotid无效");
_dictionaryService.CorrectionHRPDepartment(allotId);
return new ApiResponse(ResponseType.OK);
}
#endregion #endregion
#region 二次分配别名配置 #region 二次分配别名配置
...@@ -768,5 +788,30 @@ public ApiResponse SaveSecondaryAlias([FromBody] SaveCollectData request) ...@@ -768,5 +788,30 @@ public ApiResponse SaveSecondaryAlias([FromBody] SaveCollectData request)
} }
#endregion #endregion
#region 费用类型系数
[HttpPost("drugtype/factor")]
public ApiResponse GetDrugtypeFactor([FromBody] AllotDeptRequest request)
{
var data = _configService.GetDrugtypeFactor(request);
return new ApiResponse(ResponseType.OK, data);
}
[HttpPost("drugtype/factor/config")]
public ApiResponse GetDrugtypeFactorConfig([FromBody] AllotDeptRequest request)
{
var data = _configService.GetDrugtypeFactorConfig(request.HospitalId, request.AllotId);
return new ApiResponse(ResponseType.OK, data);
}
[HttpPost("drugtype/factor/save")]
public ApiResponse SaveDrugtypeFactor([FromBody] DrugtypeFactorRequest request)
{
_configService.SaveDrugtypeFactor(request);
return new ApiResponse(ResponseType.OK, "保存成功！");
}
#endregion
} }
} }
\ No newline at end of file
performance/Performance.Api/Controllers/CostTransferController.cs 0 → 100644
using Microsoft.AspNetCore.Mvc;
using Performance.DtoModels;
using Performance.EntityModels;
using Performance.Services;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Performance.Api.Controllers
{
[Route("api/[controller]")]
public class CostTransferController : Controller
{
private readonly CostTransferService costTransferService;
private readonly ClaimService claim;
private readonly RoleService roleService;
private readonly UserService userService;
public CostTransferController(
CostTransferService costTransferService,
ClaimService claim,
RoleService roleService,
UserService userService)
{
this.costTransferService = costTransferService;
this.claim = claim;
this.roleService = roleService;
this.userService = userService;
}
/// <summary>
/// 申请划拨
/// </summary>
/// <returns></returns>
[Route("submit")]
[HttpPost]
public ApiResponse SubmitApplications([FromBody] CostTransferRequest request)
{
if (request.AllotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
var result = costTransferService.Applicat(request);
return new ApiResponse(ResponseType.OK, result);
}
/// <summary>
///
/// </summary>
/// <returns></returns>
[Route("common/{hospitalId}/allot/{allotId}")]
[HttpPost]
public ApiResponse Common(int hospitalId, int allotId, [FromBody] DepartmentDetail detail)
{
if (hospitalId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数HospitalId无效！");
if (allotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
var userid = claim.GetUserId();
var user = userService.GetUser(userid);
var role = roleService.GetARole(user.UserID);
var result = costTransferService.Common(allotId, hospitalId, role.Type.Value, user.Department, detail);
result.deparment = user.Department ?? "";
return new ApiResponse(ResponseType.OK, result);
}
/// <summary>
/// 当前科室、类别
/// </summary>
/// <returns></returns>
[Route("deptdetial/{hospitalId}/allot/{allotId}")]
[HttpPost]
public ApiResponse DeptDetial(int hospitalId, int allotId)
{
if (hospitalId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数HospitalId无效！");
if (allotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
var userid = claim.GetUserId();
var user = userService.GetUser(userid);
var role = roleService.GetARole(user.UserID);
var result = costTransferService.DeptDetial(allotId, hospitalId, role.Type.Value, user.Department);
result.Item2.Department = user.Department ?? "";
return new ApiResponse(ResponseType.OK, result.Item2);
}
/// <summary>
/// 撤回提交
/// </summary>
/// <param name="itemId"></param>
/// <returns></returns>
[Route("withdrawsubmit/{itemId}")]
[HttpPost]
public ApiResponse WithdrawSubmit(int itemId)
{
if (itemId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数itemId无效!");
costTransferService.WithdrawSubmit(itemId);
return new ApiResponse(ResponseType.OK);
}
/// <summary>
/// 审核列表
/// </summary>
/// <param name="allotId"></param>
/// <param name="menuType"></param>
/// <returns></returns>
[Route("auditlist/{allotId}/menuType/{menuType}")]
[HttpPost]
public ApiResponse AuditList(int allotId, int menuType)
{
if (allotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
var userid = claim.GetUserId();
var user = userService.GetUser(userid);
var role = roleService.GetARole(user.UserID);
var result = costTransferService.GetAuditList(allotId, menuType, role.Type.Value, user.Department);
return new ApiResponse(ResponseType.OK, result);
}
/// <summary>
/// 划拨审核
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[Route("costtransferaudit")]
[HttpPost]
public ApiResponse Audit([FromBody] AuditRequest request)
{
if (request.AllotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
var userid = claim.GetUserId();
var user = userService.GetUser(userid);
var role = roleService.GetARole(user.UserID);
var roleArr = new[] { 1, 2, 5 };
if (roleArr.Contains(role.Type.Value))
costTransferService.CostTransferAudit(request, true);
else
costTransferService.CostTransferAudit(request, false);
return new ApiResponse(ResponseType.OK);
}
/// <summary>
/// 驳回修改
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[Route("updateapplicat")]
[HttpPost]
public ApiResponse UpdateApplicat([FromBody] CostTransferUpdateRequest request)
{
if (request.AllotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
costTransferService.UpdateApplicat(request);
return new ApiResponse(ResponseType.OK);
}
/// <summary>
/// 划拨报表
/// </summary>
/// <param name="allotId"></param>
/// <param name="auditType"></param>
/// <param name="detail"></param>
/// <returns></returns>
[Route("transfercontent/{allotId}/auditType/{auditType}")]
[HttpPost]
public ApiResponse TransferContent(int allotId,int auditType ,[FromBody] DepartmentDetail detail)
{
if (allotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
var result=costTransferService.TransferContent(allotId,auditType,detail);
return new ApiResponse(ResponseType.OK,result);
}
}
}
performance/Performance.Api/Filters/RequestRateLimitingMiddleware.cs
...@@ -73,7 +73,7 @@ public class RequestRateLimitingMiddleware ...@@ -73,7 +73,7 @@ public class RequestRateLimitingMiddleware
var response = new ApiResponse var response = new ApiResponse
{ {
State = ResponseType.TooManyRequests, State = ResponseType.TooManyRequests,
Message = "访问过于频繁，请稍后重试" Message = "您的操作正在处理，请稍等片刻！"
}; };
await context.Response.WriteAsync(JsonHelper.Serialize(response)); await context.Response.WriteAsync(JsonHelper.Serialize(response));
} }
......
performance/Performance.Api/Properties/PublishProfiles/FolderProfile.pubxml
...@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. ...@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration> <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform> <LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider> <PublishProvider>FileSystem</PublishProvider>
<PublishUrl>bin\Release\netcoreapp2.2\publish\</PublishUrl> <PublishUrl>D:\publish\jx.suvalue.com2</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod> <WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish /> <SiteUrlToLaunchAfterPublish />
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp2.2</TargetFramework>
......
performance/Performance.Api/appsettings.Localhost.json
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
}, },
"AppConnection": { "AppConnection": {
//"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;", //"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
"PerformanceConnectionString": "server=192.168.18.166;database=db_test_yubei;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;", "PerformanceConnectionString": "server=192.168.18.166;database=db_performance_screen;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
"HangfireConnectionString": "server=192.168.18.166;database=db_hangfire;uid=root;pwd=1234qwer;port=3306;allow user variables=true;", "HangfireConnectionString": "server=192.168.18.166;database=db_hangfire;uid=root;pwd=1234qwer;port=3306;allow user variables=true;",
"RedisConnectionString": "116.62.245.55:6379,defaultDatabase=2" "RedisConnectionString": "116.62.245.55:6379,defaultDatabase=2"
}, },
...@@ -38,7 +38,13 @@ ...@@ -38,7 +38,13 @@
"HttpPost": "http://localhost:50997/api/" "HttpPost": "http://localhost:50997/api/"
}, },
"RateLimitingConfig": { "RateLimitingConfig": {
"Endpoints": [ "/api/second/savevalue", "/api/second/savedata", "/api/second/other/save" ], "Endpoints": [
"/api/second/savevalue",
"/api/second/savedata",
"/api/second/other/save",
"/api/second/redistribution/save",
"/api/second/redistribution/submit"
],
"Period": "1", // 单位为秒 "Period": "1", // 单位为秒
"Limit": 1 "Limit": 1
} }
......
performance/Performance.Api/wwwroot/Performance.Api.xml
...@@ -696,6 +696,7 @@ ...@@ -696,6 +696,7 @@
核算单元及组别批量添加 核算单元及组别批量添加
</summary> </summary>
<param name="allotId"></param> <param name="allotId"></param>
<param name="request"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.ConfigController.WorkHeader(Performance.DtoModels.WorkItemRequest)"> <member name="M:Performance.Api.Controllers.ConfigController.WorkHeader(Performance.DtoModels.WorkItemRequest)">
...@@ -717,7 +718,16 @@ ...@@ -717,7 +718,16 @@
<summary> <summary>
保存HRP人员科室 保存HRP人员科室
</summary> </summary>
<param name=""></param> <param name="hospitalId"></param>
<param name="allotId"></param>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ConfigController.StandardHrpDept(System.Int32)">
<summary>
校正HRP人员的科室信息
</summary>
<param name="allotId"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.ConfigController.GetSecondaryAlias"> <member name="M:Performance.Api.Controllers.ConfigController.GetSecondaryAlias">
...@@ -732,6 +742,62 @@ ...@@ -732,6 +742,62 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.CostTransferController.SubmitApplications(Performance.DtoModels.CostTransferRequest)">
<summary>
申请划拨
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.Common(System.Int32,System.Int32,Performance.DtoModels.DepartmentDetail)">
<summary>
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.DeptDetial(System.Int32,System.Int32)">
<summary>
当前科室、类别
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.WithdrawSubmit(System.Int32)">
<summary>
撤回提交
</summary>
<param name="itemId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.AuditList(System.Int32,System.Int32)">
<summary>
审核列表
</summary>
<param name="allotId"></param>
<param name="menuType"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.Audit(Performance.DtoModels.AuditRequest)">
<summary>
划拨审核
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.UpdateApplicat(Performance.DtoModels.CostTransferUpdateRequest)">
<summary>
驳回修改
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.TransferContent(System.Int32,System.Int32,Performance.DtoModels.DepartmentDetail)">
<summary>
划拨报表
</summary>
<param name="allotId"></param>
<param name="auditType"></param>
<param name="detail"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.EmployeeController.GetEmployeeList(Performance.DtoModels.EmployeeRequest)"> <member name="M:Performance.Api.Controllers.EmployeeController.GetEmployeeList(Performance.DtoModels.EmployeeRequest)">
<summary> <summary>
获取人员列表 获取人员列表
...@@ -1536,6 +1602,12 @@ ...@@ -1536,6 +1602,12 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.SecondAllotController.WorkloadMap(System.Int32)">
<summary>
获取二次分配 提取工作量带出字典
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.SingleSave(Performance.EntityModels.ag_workload_type,System.Int32)"> <member name="M:Performance.Api.Controllers.SecondAllotController.SingleSave(Performance.EntityModels.ag_workload_type,System.Int32)">
<summary> <summary>
保存二次绩效工作量类型 保存二次绩效工作量类型
...@@ -1647,6 +1719,55 @@ ...@@ -1647,6 +1719,55 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.SecondAllotController.RedistributionLoad(Performance.DtoModels.SecondLoadDto)">
<summary>
二次绩效录入页面
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.RedistributionCheck(Performance.DtoModels.SecondComputeDto)">
<summary>
提交数据正确性检验
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.RedistributionCompute(Performance.DtoModels.SecondComputeDto)">
<summary>
二次绩效结果计算
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.RedistributionSave(Performance.DtoModels.SecondComputeDto)">
<summary>
二次绩效保存
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.RedistributionSubmit(Performance.DtoModels.SecondComputeDto)">
<summary>
二次绩效提交
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.RedistributionEmployee(Performance.DtoModels.SecondEmployeeDto)">
<summary>
二次分配人员字典带出
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.RedistributionDetail(Performance.DtoModels.SecondBaseDto)">
<summary>
二次分配审核后查看详情
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SheetController.SheetList(Performance.DtoModels.SheetRequest)"> <member name="M:Performance.Api.Controllers.SheetController.SheetList(Performance.DtoModels.SheetRequest)">
<summary> <summary>
sheet 列表 sheet 列表
......
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
<summary> 正在生成绩效 </summary> <summary> 正在生成绩效 </summary>
</member> </member>
<member name="F:Performance.DtoModels.AllotStates.GenerateSucceed"> <member name="F:Performance.DtoModels.AllotStates.GenerateSucceed">
<summary> 绩效结果通过审核，允许下发 </summary> <summary> 绩效下发 </summary>
</member> </member>
<member name="F:Performance.DtoModels.AllotStates.GenerateFail"> <member name="F:Performance.DtoModels.AllotStates.GenerateFail">
<summary> 绩效解析失败 </summary> <summary> 绩效解析失败 </summary>
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
<summary> 归档 </summary> <summary> 归档 </summary>
</member> </member>
<member name="F:Performance.DtoModels.AllotStates.Wait"> <member name="F:Performance.DtoModels.AllotStates.Wait">
<summary> 归档 </summary> <summary> 等待 </summary>
</member> </member>
<member name="F:Performance.DtoModels.AllotStates.GenerateAccomplish"> <member name="F:Performance.DtoModels.AllotStates.GenerateAccomplish">
<summary> 绩效结果解析成功 </summary> <summary> 绩效结果解析成功 </summary>
...@@ -848,6 +848,9 @@ ...@@ -848,6 +848,9 @@
<member name="F:Performance.DtoModels.SheetType.Custom"> <member name="F:Performance.DtoModels.SheetType.Custom">
<summary> 自定义抽取模板 </summary> <summary> 自定义抽取模板 </summary>
</member> </member>
<member name="F:Performance.DtoModels.SheetType.OnlyExtract">
<summary> 抽取数据，不写入 </summary>
</member>
<member name="T:Performance.DtoModels.AccountUnitType"> <member name="T:Performance.DtoModels.AccountUnitType">
<summary> <summary>
核算单元类型 核算单元类型
...@@ -2531,6 +2534,11 @@ ...@@ -2531,6 +2534,11 @@
是否是单项奖励 是否是单项奖励
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.WorkloadRequest.SourceCategory">
<summary>
工作量带出HIS来源
</summary>
</member>
<member name="P:Performance.DtoModels.WorkyearRequest.MaxRange"> <member name="P:Performance.DtoModels.WorkyearRequest.MaxRange">
<summary> <summary>
最大工龄范围（小于） 最大工龄范围（小于）
...@@ -2977,6 +2985,36 @@ ...@@ -2977,6 +2985,36 @@
职称 职称
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.CostTransferResponse.AllotId">
<summary>
</summary>
</member>
<member name="P:Performance.DtoModels.CostTransferResponse.ApplicantUnitType">
<summary>
申请者核算单元类型
</summary>
</member>
<member name="P:Performance.DtoModels.CostTransferResponse.ApplicantDepartment">
<summary>
申请者科室
</summary>
</member>
<member name="P:Performance.DtoModels.CostTransferResponse.AdoptedUnitType">
<summary>
审核者核算单元类型
</summary>
</member>
<member name="P:Performance.DtoModels.CostTransferResponse.AdoptedDepartment">
<summary>
审核者科室
</summary>
</member>
<member name="P:Performance.DtoModels.CostTransferResponse.Status">
<summary>
0 未审核 1 部分审核 2 全部审核
</summary>
</member>
<member name="P:Performance.DtoModels.DeptDataDetails`1.Pandect"> <member name="P:Performance.DtoModels.DeptDataDetails`1.Pandect">
<summary> 概览</summary> <summary> 概览</summary>
</member> </member>
...@@ -3702,6 +3740,61 @@ ...@@ -3702,6 +3740,61 @@
签字 签字
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.TotalPerformance">
<summary>
可分配绩效
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.TotalDistPerformance">
<summary>
科室总绩效
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.TheTotalAllocationOfPerformanceResults">
<summary>
科室单项奖励
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.DirectorBasisPerformance">
<summary>
主任基础绩效
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.NightShiftWorkPerforTotal">
<summary>
夜班绩效总和
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.HosOtherPerformance">
<summary>
医院其他绩效
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.SeniorityTitlesAccountedPerformance">
<summary>
年资职称绩效占比
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.SeniorityTitlesPerformance">
<summary>
年资职称绩效
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.Workload_Ratio_Default">
<summary>
工作量绩效占比
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.Workload_Amount_Default">
<summary>
工作量分配绩效金额
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.WorkloadTypes">
<summary>
其他工作量占比
</summary>
</member>
<member name="P:Performance.DtoModels.SheetExportResponse.SheetID"> <member name="P:Performance.DtoModels.SheetExportResponse.SheetID">
<summary> <summary>
sheetID sheetID
...@@ -3787,6 +3880,81 @@ ...@@ -3787,6 +3880,81 @@
绩效系数 绩效系数
</summary> </summary>
</member> </member>
<member name="T:Performance.DtoModels.Second.ComputeMode">
<summary>
二次分配计算方式
</summary>
</member>
<member name="F:Performance.DtoModels.Second.ComputeMode.NotCalculate">
<summary>
填报(不计算)
</summary>
</member>
<member name="F:Performance.DtoModels.Second.ComputeMode.Horizontal">
<summary>
横向计算
</summary>
</member>
<member name="F:Performance.DtoModels.Second.ComputeMode.Vertical">
<summary>
纵向计算
</summary>
</member>
<member name="P:Performance.DtoModels.SecondBaseDto.ComputeMode">
<summary>
计算方式：11 不计算 12 横向计算 13 纵向计算
</summary>
</member>
<member name="P:Performance.DtoModels.SecondColumnDictionary.Label">
<summary>
描述
</summary>
</member>
<member name="P:Performance.DtoModels.SecondColumnDictionary.Key">
<summary>
主键
</summary>
</member>
<member name="P:Performance.DtoModels.SecondColumnDictionary.IsTrue">
<summary>
是否显示 true显示
</summary>
</member>
<member name="P:Performance.DtoModels.SecondColumnDictionary.Width">
<summary>
宽度
</summary>
</member>
<member name="P:Performance.DtoModels.SecondColumnDictionary.Sort">
<summary>
排序
</summary>
</member>
<member name="P:Performance.DtoModels.SecondColumnDictionary.Site">
<summary>
位置 Top、Table
</summary>
</member>
<member name="P:Performance.DtoModels.SecondColumnDictionary.Type">
<summary>
类型 单项奖励：SingleAwards，工作量：Workload
</summary>
</member>
<member name="P:Performance.DtoModels.SecondColumnDictionary.Color">
<summary>
颜色class名称
</summary>
</member>
<member name="P:Performance.DtoModels.SecondEmployeeDto.ComputeMode">
<summary>
计算方式：11 不计算 12 横向计算 13 纵向计算
</summary>
</member>
<member name="P:Performance.DtoModels.SecondLoadDto.OverrideMode">
<summary>
数据加载方式：0 保存，1 上次，2 字典
</summary>
</member>
<member name="P:Performance.DtoModels.SelectionOptions.SelectionID"> <member name="P:Performance.DtoModels.SelectionOptions.SelectionID">
<summary> <summary>
ID ID
...@@ -3842,24 +4010,29 @@ ...@@ -3842,24 +4010,29 @@
数据集合 数据集合
</summary> </summary>
</member> </member>
<member name="T:Performance.DtoModels.TitleValue`1"> <member name="T:Performance.DtoModels.TitleValue`2">
<summary> <summary>
title value title value
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.TitleValue`1.Title"> <member name="P:Performance.DtoModels.TitleValue`2.Title">
<summary> <summary>
Title Title
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.TitleValue`1.Value"> <member name="P:Performance.DtoModels.TitleValue`2.Value">
<summary> <summary>
Value Value
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.TitleValue`1.State"> <member name="P:Performance.DtoModels.TitleValue`2.State">
<summary> <summary>
1、已选，2、未选，3、已被选择 存储数据
</summary>
</member>
<member name="T:Performance.DtoModels.TitleValue`1">
<summary>
title value
</summary> </summary>
</member> </member>
<member name="T:Performance.DtoModels.TitleValue"> <member name="T:Performance.DtoModels.TitleValue">
......
performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs
...@@ -235,10 +235,13 @@ public AutoMapperConfigs() ...@@ -235,10 +235,13 @@ public AutoMapperConfigs()
CreateMap<HistoryData, report_original_surgery>() CreateMap<HistoryData, report_original_surgery>()
.ForMember(dest => dest.PersonTime, opt => opt.MapFrom(src => src.ResultData)) .ForMember(dest => dest.PersonTime, opt => opt.MapFrom(src => src.ResultData))
.ReverseMap(); .ReverseMap();
}
public void xx() CreateMap<cost_transfer, CostTransferResponse>(
{ ).ForMember(back => back.Items, n => n.Ignore());
CreateMap<cost_transfer, cost_transfer>(
).ForMember(back => back.Id, n => n.Ignore());
CreateMap<ag_headsource, SecPrintHeaderResponse>().ReverseMap();
} }
} }
} }
performance/Performance.DtoModels/Enum.cs
...@@ -65,8 +65,8 @@ public enum AllotStates ...@@ -65,8 +65,8 @@ public enum AllotStates
/// <summary> 正在生成绩效 </summary> /// <summary> 正在生成绩效 </summary>
[Description("正在生成绩效")] [Description("正在生成绩效")]
InGenerate = 5, InGenerate = 5,
/// <summary> 绩效结果通过审核，允许下发 </summary> /// <summary> 绩效下发 </summary>
[Description("数据验证通过")] [Description("绩效下发")]
GenerateSucceed = 6, GenerateSucceed = 6,
/// <summary> 绩效解析失败 </summary> /// <summary> 绩效解析失败 </summary>
[Description("绩效解析失败")] [Description("绩效解析失败")]
...@@ -74,7 +74,7 @@ public enum AllotStates ...@@ -74,7 +74,7 @@ public enum AllotStates
/// <summary> 归档 </summary> /// <summary> 归档 </summary>
[Description("归档")] [Description("归档")]
Archive = 8, Archive = 8,
/// <summary> 归档 </summary> /// <summary> 等待 </summary>
[Description("等待")] [Description("等待")]
Wait = 9, Wait = 9,
/// <summary> 绩效结果解析成功 </summary> /// <summary> 绩效结果解析成功 </summary>
......
performance/Performance.DtoModels/HandsonTable.cs
...@@ -13,13 +13,13 @@ public HandsonTableBase() ...@@ -13,13 +13,13 @@ public HandsonTableBase()
ColHeaders = new List<string>(); ColHeaders = new List<string>();
Columns = new List<HandsonColumn>(); Columns = new List<HandsonColumn>();
Data = new List<Dictionary<string, object>>(); Data = new List<Dictionary<string, object>>();
NestedHeadersArray = new List<List<string>>(); NestedHeadersArray = new object[] { };
} }
public List<string> ColHeaders { get; set; } public List<string> ColHeaders { get; set; }
public List<Dictionary<string, object>> Data { get; set; } public List<Dictionary<string, object>> Data { get; set; }
public List<HandsonColumn> Columns { get; set; } public List<HandsonColumn> Columns { get; set; }
public List<List<string>> NestedHeadersArray { get; set; } public object[] NestedHeadersArray { get; set; }
} }
public class HandsonTable : HandsonTableBase public class HandsonTable : HandsonTableBase
...@@ -185,4 +185,17 @@ public HandsonCellData(string name, object value) ...@@ -185,4 +185,17 @@ public HandsonCellData(string name, object value)
public string Name { get; set; } public string Name { get; set; }
public object Value { get; set; } public object Value { get; set; }
} }
public class NestedHeader
{
public NestedHeader(string label, int colspan)
{
Label = label;
Colspan = colspan;
}
public string Label { get; set; }
public int Colspan { get; set; }
}
} }
performance/Performance.DtoModels/PerExcel/ExcelEnum.cs
...@@ -195,6 +195,10 @@ public enum SheetType ...@@ -195,6 +195,10 @@ public enum SheetType
/// <summary> 自定义抽取模板 </summary> /// <summary> 自定义抽取模板 </summary>
[Description("自定义抽取模板")] [Description("自定义抽取模板")]
Custom = 101, Custom = 101,
/// <summary> 抽取数据，不写入 </summary>
[Description("抽取数据，不写入")]
OnlyExtract = 102,
} }
/// <summary> /// <summary>
......
performance/Performance.DtoModels/Request/CostTransferItemRequest.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
namespace Performance.DtoModels
{
public class CostTransferItemRequest
{
public string Category { get; set; }
public string Source { get; set; }
public decimal? Ratio { get; set; }
public decimal? Amount { get; set; }
public decimal? CalculationAmount { get; set; }
public int IsUseRatio { get; set; }
public string ApplicationRemark { get; set; }
}
}
performance/Performance.DtoModels/Request/CostTransferRequest.cs 0 → 100644
using Performance.EntityModels;
using System;
using System.Collections.Generic;
using System.Text;
namespace Performance.DtoModels
{
public class CostTransferRequest
{
public int AllotId { get; set; }
public DepartmentDetail Applicant { get; set; }
public DepartmentDetail Adopted { get; set; }
public List<CostTransferItemRequest> Items { get; set; }
}
public class DepartmentDetail
{
public string UnitType { get; set; }
public string Department { get; set; }
}
public class CostTransferUpdateRequest : CostTransferRequest
{
public int TransferId { get; set; }
public new List<cost_transfer_item> Items { get; set; }
}
public class AuditRequest
{
public int AllotId { get; set; }
public int[] TransferItemId { get; set; }
public int Status { get; set; }
public string Remake { get; set; }
}
}
performance/Performance.DtoModels/Request/DrugtypeFactorRequest.cs 0 → 100644
using System.Collections.Generic;
namespace Performance.DtoModels
{
public class DrugtypeFactorRequest
{
public int HospitalId { get; set; }
public int AllotId { get; set; }
public List<Dictionary<string, object>> Data { get; set; }
}
}
performance/Performance.DtoModels/Request/WorkloadRequest.cs
...@@ -51,6 +51,11 @@ public class WorkloadRequest ...@@ -51,6 +51,11 @@ public class WorkloadRequest
/// 是否是单项奖励 /// 是否是单项奖励
/// </summary> /// </summary>
public bool IsSingleAwards { get; set; } public bool IsSingleAwards { get; set; }
/// <summary>
/// 工作量带出HIS来源
/// </summary>
public string SourceCategory { get; set; }
} }
public class WorkloadRequestValidator : AbstractValidator<WorkloadRequest> public class WorkloadRequestValidator : AbstractValidator<WorkloadRequest>
{ {
......
performance/Performance.DtoModels/Response/CostTransferResponse.cs 0 → 100644
using Performance.EntityModels;
using System;
using System.Collections.Generic;
using System.Text;
namespace Performance.DtoModels
{
public class CostTransferResponse
{
public int Id { get; set; }
/// <summary>
///
/// </summary>
public int AllotId { get; set; }
/// <summary>
/// 申请者核算单元类型
/// </summary>
public string ApplicantUnitType { get; set; }
/// <summary>
/// 申请者科室
/// </summary>
public string ApplicantDepartment { get; set; }
/// <summary>
/// 审核者核算单元类型
/// </summary>
public string AdoptedUnitType { get; set; }
/// <summary>
/// 审核者科室
/// </summary>
public string AdoptedDepartment { get; set; }
/// <summary>
/// 0 未审核 1 部分审核 2 全部审核
/// </summary>
public int Status { get; set; }
public int AdminStatus { get; set; }
public decimal AmountSum { get; set; }
public List<Option> Items { get; set; }
}
public class CommonResponse
{
public string deparment { get; set; }
public string unitType { get; set; }
public List<TitleValue> account { get; set; }
public List<Common> Data { get; set; }
}
public class Common
{
public string Source { get; set; }
public string Category { get; set; }
public decimal? Ratio { get; set; }
}
public class Option : cost_transfer_item
{
public string[] options { get; set; }
public string ApplicantDepartment { get; set; }
public string AdoptedDepartment { get; set; }
}
}
performance/Performance.DtoModels/Response/SecPrintResponse.cs
...@@ -61,4 +61,62 @@ public class SecPrintResponse ...@@ -61,4 +61,62 @@ public class SecPrintResponse
public int RowNumber { get; set; } public int RowNumber { get; set; }
} }
public class SecPrintHeaderResponse
{
/// <summary>
/// 可分配绩效
/// </summary>
public decimal TotalPerformance { get; set; }
/// <summary>
/// 科室总绩效
/// </summary>
public decimal TotalDistPerformance { get; set; }
/// <summary>
/// 科室单项奖励
/// </summary>
public decimal TheTotalAllocationOfPerformanceResults { get; set; }
/// <summary>
/// 主任基础绩效
/// </summary>
public decimal DirectorBasisPerformance { get; set; }
/// <summary>
/// 夜班绩效总和
/// </summary>
public decimal NightShiftWorkPerforTotal { get; set; }
/// <summary>
/// 医院其他绩效
/// </summary>
public decimal HosOtherPerformance { get; set; }
/// <summary>
/// 年资职称绩效占比
/// </summary>
public decimal SeniorityTitlesAccountedPerformance { get; set; }
/// <summary>
/// 年资职称绩效
/// </summary>
public decimal SeniorityTitlesPerformance { get; set; }
/// <summary>
/// 工作量绩效占比
/// </summary>
public decimal Workload_Ratio_Default { get; set; }
/// <summary>
/// 工作量分配绩效金额
/// </summary>
public decimal Workload_Amount_Default { get; set; }
/// <summary>
/// 其他工作量占比
/// </summary>
public List<TitleValue<decimal>> WorkloadTypes { get; set; }
}
} }
performance/Performance.DtoModels/Response/TransferReportResponse.cs 0 → 100644
using Performance.EntityModels;
using System;
using System.Collections.Generic;
using System.Text;
namespace Performance.DtoModels
{
public class TransferReportResponse
{
public List<Transfer> Transfers { get; set; }
public List<TransferItem> Items { get; set; }
}
public class Transfer
{
public string ApplicantUnitType { get; set; }
public string ApplicantDepartment { get; set; }
public decimal? AmountSum { get; set; }
public string AdoptedUnitType { get; set; }
public string AdoptedDepartment { get; set; }
public decimal? PassAmountSum { get; set; }
}
public class TransferItem : cost_transfer_item
{
public string ApplicantUnitType { get; set; }
public string ApplicantDepartment { get; set; }
public string AdoptedUnitType { get; set; }
public string AdoptedDepartment { get; set; }
}
}
performance/Performance.DtoModels/ResponseType.cs
...@@ -14,5 +14,6 @@ public enum ResponseType ...@@ -14,5 +14,6 @@ public enum ResponseType
ParameterError = 6, ParameterError = 6,
Disable = 7, Disable = 7,
TooManyRequests = 8, TooManyRequests = 8,
Warning = 9,
} }
} }
performance/Performance.DtoModels/Second/Constant.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace Performance.DtoModels.Second
{
/// <summary>
/// 二次分配计算方式
/// </summary>
public enum ComputeMode
{
/// <summary>
/// 填报(不计算)
/// </summary>
[Description("填报")]
NotCalculate = 11,
/// <summary>
/// 横向计算
/// </summary>
[Description("横向计算")]
Horizontal = 12,
/// <summary>
/// 纵向计算
/// </summary>
[Description("纵向计算")]
Vertical = 13,
}
}
performance/Performance.DtoModels/Second/SecondBaseDto.cs 0 → 100644
namespace Performance.DtoModels
{
public class SecondBaseDto
{
public int SecondId { get; set; }
/// <summary>
/// 计算方式：11 不计算 12 横向计算 13 纵向计算
/// </summary>
public int ComputeMode { get; set; }
}
}
performance/Performance.DtoModels/Second/SecondColumnDictionary.cs 0 → 100644
namespace Performance.DtoModels
{
public class SecondColumnDictionary
{
/// <summary>
/// 描述
/// </summary>
public string Label { get; set; }
/// <summary>
/// 主键
/// </summary>
public string Key { get; set; }
/// <summary>
/// 是否显示 true显示
/// </summary>
public bool IsTrue { get; set; }
/// <summary>
/// 宽度
/// </summary>
public string Width { get; set; }
/// <summary>
/// 排序
/// </summary>
public int Sort { get; set; }
/// <summary>
/// 位置 Top、Table
/// </summary>
public string Site { get; set; }
/// <summary>
/// 类型 单项奖励：SingleAwards，工作量：Workload
/// </summary>
public string Type { get; set; }
/// <summary>
/// 颜色class名称
/// </summary>
public string Color { get; set; }
public SecondColumnDictionary()
{
}
public SecondColumnDictionary(string label, string key, bool isTrue, int sort, string site = "Table", string type = "", string color = "", int? width = null)
{
Label = label;
Key = key;
IsTrue = isTrue;
Sort = sort;
Site = site;
Type = type;
Color = color;
Width = width.HasValue ? width.ToString() : ((label ?? "").Length * 20 + 10).ToString();
}
}
}
performance/Performance.DtoModels/Second/SecondComputeCheckResultDto.cs 0 → 100644
namespace Performance.DtoModels
{
public class SecondComputeCheckResultDto
{
public SecondComputeCheckResultDto(string level, string personnelNumber, string personnelName, string message)
{
Level = level;
PersonnelNumber = personnelNumber;
PersonnelName = personnelName;
Message = message;
}
public string Level { get; set; }
public string PersonnelNumber { get; set; }
public string PersonnelName { get; set; }
public string Message { get; set; }
}
}
performance/Performance.DtoModels/Second/SecondComputeDto.cs 0 → 100644
using System.Collections.Generic;
namespace Performance.DtoModels
{
public class SecondComputeDto : SecondLoadDto
{
public Dictionary<string, object> Head { get; set; }
public List<Dictionary<string, object>> Body { get; set; }
}
}
performance/Performance.DtoModels/Second/SecondDetailDto.cs 0 → 100644
using System.Collections.Generic;
namespace Performance.DtoModels
{
public class SecondDetailDto
{
public object Head { get; set; }
public HandsonTableBase Body { get; set; }
public List<SecondColumnDictionary> Dic { get; set; }
}
}
performance/Performance.DtoModels/Second/SecondEmployeeDto.cs 0 → 100644
namespace Performance.DtoModels
{
public class SecondEmployeeDto : PersonParamsRequest
{
public int SecondId { get; set; }
/// <summary>
/// 计算方式：11 不计算 12 横向计算 13 纵向计算
/// </summary>
public int ComputeMode { get; set; }
}
}
performance/Performance.DtoModels/Second/SecondLoadDto.cs 0 → 100644
namespace Performance.DtoModels
{
public class SecondLoadDto : SecondBaseDto
{
/// <summary>
/// 数据加载方式：0 保存，1 上次，2 字典
/// </summary>
public int OverrideMode { get; set; }
}
}
performance/Performance.DtoModels/Second/SecondWorkLoadDto.cs 0 → 100644
using System;
using System.Collections.Generic;
namespace Performance.DtoModels
{
public class SecondWorkLoadDto
{
public SecondWorkLoadDto(string name)
{
Name = name;
Unit_Price = 0m;
Items = new List<string>();
AssessmentScore = $"AssessmentScore_{Name}";
WorkPerformance = $"WorkPerformance_{Name}";
WorkloadScore = $"WorkloadScore_{Name}";
}
public string AssessmentScore { get; set; }
public string WorkPerformance { get; set; }
public string WorkloadScore { get; set; }
public decimal Unit_Price { get; set; }
public List<string> Items { get; set; }
public string Name { get; set; }
public void AddItem(string name)
{
if (!Items.Contains(name))
Items.Add(name);
}
}
}
performance/Performance.DtoModels/TitleValue.cs
...@@ -7,7 +7,7 @@ namespace Performance.DtoModels ...@@ -7,7 +7,7 @@ namespace Performance.DtoModels
/// <summary> /// <summary>
/// title value /// title value
/// </summary> /// </summary>
public class TitleValue<T> public class TitleValue<TV, TS>
{ {
/// <summary> /// <summary>
/// Title /// Title
...@@ -16,11 +16,17 @@ public class TitleValue<T> ...@@ -16,11 +16,17 @@ public class TitleValue<T>
/// <summary> /// <summary>
/// Value /// Value
/// </summary> /// </summary>
public T Value { get; set; } public TV Value { get; set; }
/// <summary> /// <summary>
/// 1、已选，2、未选，3、已被选择 /// 存储数据
/// </summary> /// </summary>
public int State { get; set; } public TS State { get; set; }
}
/// <summary>
/// title value
/// </summary>
public class TitleValue<T> : TitleValue<T, int>
{
} }
/// <summary> /// <summary>
/// title value /// title value
......
performance/Performance.EntityModels/Context/PerformanceDbContext.cs
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Metadata;
using System; using System;
...@@ -78,6 +77,8 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options) ...@@ -78,6 +77,8 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
public virtual DbSet<cof_drugtype> cof_drugtype { get; set; } public virtual DbSet<cof_drugtype> cof_drugtype { get; set; }
/// <summary> 药占比支出费用列头名称 </summary> /// <summary> 药占比支出费用列头名称 </summary>
public virtual DbSet<cof_drugtype_disburse> cof_drugtype_disburse { get; set; } public virtual DbSet<cof_drugtype_disburse> cof_drugtype_disburse { get; set; }
/// <summary> 药占比费用列头名称系数 </summary>
public virtual DbSet<cof_drugtype_factor> cof_drugtype_factor { get; set; }
/// <summary> 保底科室配置 </summary> /// <summary> 保底科室配置 </summary>
public virtual DbSet<cof_guarantee> cof_guarantee { get; set; } public virtual DbSet<cof_guarantee> cof_guarantee { get; set; }
/// <summary> </summary> /// <summary> </summary>
...@@ -92,11 +93,14 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options) ...@@ -92,11 +93,14 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
public virtual DbSet<cof_workloadtype> cof_workloadtype { get; set; } public virtual DbSet<cof_workloadtype> cof_workloadtype { get; set; }
/// <summary> 工龄对应绩效系数配置 </summary> /// <summary> 工龄对应绩效系数配置 </summary>
public virtual DbSet<cof_workyear> cof_workyear { get; set; } public virtual DbSet<cof_workyear> cof_workyear { get; set; }
/// <summary> </summary> /// <summary> </summary>
public virtual DbSet<collect_data> collect_data { get; set; } public virtual DbSet<collect_data> collect_data { get; set; }
/// <summary> </summary> /// <summary> </summary>
public virtual DbSet<collect_permission> collect_permission { get; set; } public virtual DbSet<collect_permission> collect_permission { get; set; }
/// <summary> </summary>
public virtual DbSet<cost_transfer> cost_transfer { get; set; }
/// <summary> </summary>
public virtual DbSet<cost_transfer_item> cost_transfer_item { get; set; }
/// <summary> 自定义导出 </summary> /// <summary> 自定义导出 </summary>
public virtual DbSet<cust_script> cust_script { get; set; } public virtual DbSet<cust_script> cust_script { get; set; }
/// <summary> </summary> /// <summary> </summary>
......
performance/Performance.EntityModels/Entity/ag_bodysource.cs
...@@ -72,24 +72,34 @@ public class ag_bodysource ...@@ -72,24 +72,34 @@ public class ag_bodysource
public Nullable<decimal> TitleCoefficient { get; set; } public Nullable<decimal> TitleCoefficient { get; set; }
/// <summary> /// <summary>
/// 职称绩效 /// 职称绩效得分
/// </summary> /// </summary>
public Nullable<decimal> TitlePerformance { get; set; } public Nullable<decimal> TitlePerformanceScore { get; set; }
/// <summary> /// <summary>
/// 管理津贴 /// 职称绩效
/// </summary> /// </summary>
public Nullable<decimal> ManagementAllowance { get; set; } public Nullable<decimal> TitlePerformance { get; set; }
/// <summary> /// <summary>
/// 单项奖励 /// 工作量绩效
/// </summary> /// </summary>
public Nullable<decimal> IndividualReward { get; set; } public Nullable<decimal> WorkPerformance { get; set; }
/// <summary> ///// <summary>
/// 重点专科分配 ///// 管理津贴
/// </summary> ///// </summary>
public Nullable<decimal> AllocationOfKeySpecialty { get; set; } //public Nullable<decimal> ManagementAllowance { get; set; }
///// <summary>
///// 单项奖励
///// </summary>
//public Nullable<decimal> IndividualReward { get; set; }
///// <summary>
///// 重点专科分配
///// </summary>
//public Nullable<decimal> AllocationOfKeySpecialty { get; set; }
/// <summary> /// <summary>
/// 科室单项奖励 /// 科室单项奖励
...@@ -117,7 +127,7 @@ public class ag_bodysource ...@@ -117,7 +127,7 @@ public class ag_bodysource
public Nullable<decimal> NightWorkPerformance { get; set; } public Nullable<decimal> NightWorkPerformance { get; set; }
/// <summary> /// <summary>
/// 实发绩效工资金额 /// 实发绩效(不含医院其他绩效)
/// </summary> /// </summary>
public Nullable<decimal> RealAmount { get; set; } public Nullable<decimal> RealAmount { get; set; }
...@@ -135,5 +145,15 @@ public class ag_bodysource ...@@ -135,5 +145,15 @@ public class ag_bodysource
/// 预留金额 /// 预留金额
/// </summary> /// </summary>
public Nullable<decimal> ReservedAmount { get; set; } public Nullable<decimal> ReservedAmount { get; set; }
/// <summary>
/// 实发绩效(参考，含医院其他绩效)
/// </summary>
public Nullable<decimal> ReferToRealAmount { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
} }
} }
performance/Performance.EntityModels/Entity/ag_headsource.cs
...@@ -29,7 +29,7 @@ public class ag_headsource ...@@ -29,7 +29,7 @@ public class ag_headsource
/// <summary> /// <summary>
/// 可分配绩效 /// 可分配绩效
/// </summary> /// </summary>
public Nullable<decimal> TotalPerformance { get; set; } public decimal TotalPerformance { get; set; }
/// <summary> /// <summary>
/// 医院其他绩效 /// 医院其他绩效
...@@ -52,14 +52,19 @@ public class ag_headsource ...@@ -52,14 +52,19 @@ public class ag_headsource
public Nullable<decimal> DirectorBasisPerformance { get; set; } public Nullable<decimal> DirectorBasisPerformance { get; set; }
/// <summary> /// <summary>
/// 科室单项奖励 /// 业绩分配绩效总额
/// </summary> /// </summary>
public Nullable<decimal> TheTotalAllocationOfPerformanceResults { get; set; } public Nullable<decimal> TheTotalAllocationOfPerformanceResults { get; set; }
/// <summary> /// <summary>
/// 业绩分配绩效总额 /// 科室单项奖励
/// </summary> /// </summary>
public Nullable<decimal> BasisPerformance { get; set; } public Nullable<decimal> TotalDeptReward { get; set; }
///// <summary>
///// 业绩分配绩效总额
///// </summary>
//public Nullable<decimal> BasisPerformance { get; set; }
/// <summary> /// <summary>
/// 年资职称绩效占比 /// 年资职称绩效占比
......
performance/Performance.EntityModels/Entity/ag_secondallot.cs
...@@ -82,7 +82,7 @@ public class ag_secondallot ...@@ -82,7 +82,7 @@ public class ag_secondallot
public Nullable<int> Status { get; set; } public Nullable<int> Status { get; set; }
/// <summary> /// <summary>
/// 提交类型 1 使用模板 2 其他类型数据 /// 提交类型 1使用模板 2 其他类型数据
/// </summary> /// </summary>
public Nullable<int> SubmitType { get; set; } public Nullable<int> SubmitType { get; set; }
...@@ -125,9 +125,10 @@ public class ag_secondallot ...@@ -125,9 +125,10 @@ public class ag_secondallot
/// 护理部审核状态 2 等待审核 3 审核通过 4 驳回 /// 护理部审核状态 2 等待审核 3 审核通过 4 驳回
/// </summary> /// </summary>
public Nullable<int> NursingDeptStatus { get; set; } public Nullable<int> NursingDeptStatus { get; set; }
/// <summary> /// <summary>
/// 夜班绩效 /// 夜班绩效
/// </summary> /// </summary>
public decimal? NightShiftWorkPerforFee { get; set; } public Nullable<decimal> NightShiftWorkPerforFee { get; set; }
} }
} }
performance/Performance.EntityModels/Entity/ag_temp.cs
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
// * FileName: 二次绩效模板.cs // * FileName: 二次绩效模板.cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
......
performance/Performance.EntityModels/Entity/ag_workload.cs
...@@ -57,8 +57,13 @@ public class ag_workload ...@@ -57,8 +57,13 @@ public class ag_workload
public Nullable<decimal> Sort { get; set; } public Nullable<decimal> Sort { get; set; }
/// <summary> /// <summary>
/// 1、单项奖励 2、工作量占比 ..（自定义占比） /// -1、单项奖励 0、工作量占比 ..（自定义占比）
/// </summary> /// </summary>
public int WorkTypeId { get; set; } public int WorkTypeId { get; set; }
/// <summary>
/// 工作量来源类型
/// </summary>
public string SourceCategory { get; set; }
} }
} }
performance/Performance.EntityModels/Entity/ag_workload_source.cs
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// <copyright file=" ag_workload_source.cs"> // <copyright file=" ag_workload_source.cs">
// * FileName: .cs // * FileName: .cs
// </copyright> // </copyright>
...@@ -57,7 +57,7 @@ public class ag_workload_source ...@@ -57,7 +57,7 @@ public class ag_workload_source
public Nullable<decimal> Value { get; set; } public Nullable<decimal> Value { get; set; }
/// <summary> /// <summary>
/// 1、单项奖励 2、工作量占比 ..（自定义占比） /// -1、单项奖励 0、工作量占比 ..（自定义占比）
/// </summary> /// </summary>
public Nullable<int> WorkTypeId { get; set; } public Nullable<int> WorkTypeId { get; set; }
} }
......
performance/Performance.EntityModels/Entity/ag_workload_type.cs
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// <copyright file=" ag_workload_type.cs"> // <copyright file=" ag_workload_type.cs">
// * FileName: .cs // * FileName: 二次绩效工作量绩效分类.cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// /// 二次绩效工作量绩效分类
/// </summary> /// </summary>
[Table("ag_workload_type")] [Table("ag_workload_type")]
public class ag_workload_type public class ag_workload_type
......
performance/Performance.EntityModels/Entity/ag_worktype_source.cs
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// <copyright file=" ag_worktype_source.cs"> // <copyright file=" ag_worktype_source.cs">
// * FileName: ag_worktype_source.cs // * FileName: .cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System; using System;
......
performance/Performance.EntityModels/Entity/as_tempassess.cs
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
// * FileName: 考核类别.cs // * FileName: 考核类别.cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
......
performance/Performance.EntityModels/Entity/cof_accounting.cs
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// <copyright file=" cof_accounting.cs"> // <copyright file=" cof_accounting.cs">
// * FileName: .cs // * FileName: .cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
......
performance/Performance.EntityModels/Entity/cof_alias.cs
using System.ComponentModel.DataAnnotations; //-----------------------------------------------------------------------
// <copyright file=" cof_alias.cs">
// * FileName: 别名配置.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary>
/// 别名配置
/// </summary>
[Table("cof_alias")] [Table("cof_alias")]
public class cof_alias public class cof_alias
{ {
/// <summary>
///
/// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary>
///
/// </summary>
public int HospitalId { get; set; } public int HospitalId { get; set; }
/// <summary>
/// 前端路由地址
/// </summary>
public string Route { get; set; } public string Route { get; set; }
/// <summary>
/// 描述名称
/// </summary>
public string Name { get; set; } public string Name { get; set; }
/// <summary>
/// 原始名
/// </summary>
public string OriginalName { get; set; } public string OriginalName { get; set; }
/// <summary>
/// 别名
/// </summary>
public string Alias { get; set; } public string Alias { get; set; }
public int States { get; set; }
/// <summary>
/// 状态 1 可用 0 禁用
/// </summary>
public Nullable<int> States { get; set; }
} }
} }
performance/Performance.EntityModels/Entity/cof_drugtype_factor.cs 0 → 100644
//-----------------------------------------------------------------------
// <copyright file=" cof_drugtype_factor.cs">
// * FileName: 药占比费用列头名称.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels
{
/// <summary>
/// 药占比费用列头名称
/// </summary>
[Table("cof_drugtype_factor")]
public class cof_drugtype_factor
{
/// <summary>
///
/// </summary>
[Key]
public int ID { get; set; }
/// <summary>
///
/// </summary>
public Nullable<int> HospitalId { get; set; }
/// <summary>
///
/// </summary>
public Nullable<int> AllotID { get; set; }
/// <summary>
/// 费用名称
/// </summary>
public string Charge { get; set; }
/// <summary>
/// 收入类型
/// </summary>
public Nullable<int> ExModuleId { get; set; }
/// <summary>
/// 医生组
/// </summary>
public Nullable<decimal> YSZ { get; set; }
/// <summary>
/// 护理组
/// </summary>
public Nullable<decimal> HLZ { get; set; }
/// <summary>
/// 医技组
/// </summary>
public Nullable<decimal> YJZ { get; set; }
}
}
performance/Performance.EntityModels/Entity/cof_hrp_department.cs
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
// * FileName: .cs // * FileName: .cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
......
performance/Performance.EntityModels/Entity/collect_data.cs
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
// * FileName: .cs // * FileName: .cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
......
performance/Performance.EntityModels/Entity/collect_permission.cs
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
// * FileName: .cs // * FileName: .cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
......
performance/Performance.EntityModels/Entity/cost_transfer.cs 0 → 100644
//-----------------------------------------------------------------------
// <copyright file=" cost_transfer.cs">
// * FileName: .cs
// </copyright>
//-----------------------------------------------------------------------
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels
{
/// <summary>
///
/// </summary>
[Table("cost_transfer")]
public class cost_transfer
{
/// <summary>
///
/// </summary>
[Key]
public int Id { get; set; }
/// <summary>
///
/// </summary>
public int AllotId { get; set; }
/// <summary>
/// 申请者核算单元类型
/// </summary>
public string ApplicantUnitType { get; set; }
/// <summary>
/// 申请者科室
/// </summary>
public string ApplicantDepartment { get; set; }
/// <summary>
/// 审核者核算单元类型
/// </summary>
public string AdoptedUnitType { get; set; }
/// <summary>
/// 审核者科室
/// </summary>
public string AdoptedDepartment { get; set; }
/// <summary>
/// 0 未审核 1 全部通过 2 部分通过 3 全部驳回 4 含有下发驳回
/// </summary>
public int Status { get; set; }
/// <summary>
/// 0 未审核 1 全部通过 2 部分通过 3 全部驳回 4 含有下发驳回
/// </summary>
public int AdminStatus { get; set; }
}
}
performance/Performance.EntityModels/Entity/cost_transfer_item.cs 0 → 100644
//-----------------------------------------------------------------------
// <copyright file=" cost_transfer_item.cs">
// * FileName: .cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels
{
/// <summary>
///
/// </summary>
[Table("cost_transfer_item")]
public class cost_transfer_item
{
/// <summary>
///
/// </summary>
[Key]
public int Id { get; set; }
/// <summary>
///
/// </summary>
public int TransferId { get; set; }
/// <summary>
/// 来源，sheet名称
/// </summary>
public string Source { get; set; }
/// <summary>
/// 费用类型
/// </summary>
public string Category { get; set; }
/// <summary>
/// 金额
/// </summary>
public Nullable<decimal> Amount { get; set; }
/// <summary>
/// 分割比例
/// </summary>
public Nullable<decimal> Ratio { get; set; }
/// <summary>
/// 实际金额
/// </summary>
public Nullable<decimal> CalculationAmount { get; set; }
/// <summary>
/// 是否使用分割比例
/// </summary>
public int IsUseRatio { get; set; }
/// <summary>
/// 申请理由
/// </summary>
public string ApplicationRemark { get; set; }
/// <summary>
/// 科室备注
/// </summary>
public string DepartmentRemark { get; set; }
/// <summary>
/// 管理员备注
/// </summary>
public string AdminRemark { get; set; }
/// <summary>
/// 0 默认 1 通过 2 驳回 3 下发驳回 4 撤回
/// </summary>
public int Status { get; set; }
/// <summary>
/// 0 默认 1 通过 2 驳回 3 下发驳回 4 撤回
/// </summary>
public int AdminStatus { get; set; }
/// <summary>
/// 数据是否被写入
/// </summary>
public int IsWrited { get; set; }
}
}
performance/Performance.EntityModels/Entity/cust_script.cs
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
// * FileName: 自定义导出.cs // * FileName: 自定义导出.cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
......
performance/Performance.EntityModels/Entity/ex_script.cs
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
// * FileName: .cs // * FileName: .cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
......
performance/Performance.EntityModels/Entity/ex_type.cs
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
// * FileName: .cs // * FileName: .cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
......
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