Skip to content

P
performance
Commit 3a01c5dc by lcx
Options

Merge branch 'v2020morge' into v2020morge-graphql 

# Conflicts:
#	performance/Performance.EntityModels/Entity/report_global.cs
parents 8d04651f 38d20192
Showing with 914 additions and 122 deletions
performance/Performance.Api/Controllers/ReportGlobalController.cs
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
using Microsoft.AspNetCore.Http.Internal; using Microsoft.AspNetCore.Http.Internal;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Performance.DtoModels; using Performance.DtoModels;
using Performance.EntityModels;
using Performance.Infrastructure; using Performance.Infrastructure;
using Performance.Services; using Performance.Services;
using System; using System;
...@@ -33,6 +34,62 @@ ReportGlobalService reportGlobalService ...@@ -33,6 +34,62 @@ ReportGlobalService reportGlobalService
} }
/// <summary> /// <summary>
/// 获取报表配置信息
/// </summary>
/// <param name="hospitalId"></param>
/// <returns></returns>
[HttpGet]
public ApiResponse GetAllReportGlobal([FromRoute] int hospitalId)
{
//reportGlobalService.CopyPreviousGlobalData(new per_allot
//{
// ID = 101,
// HospitalId = 13,
// Year = 2020,
// Month = 8
//});
var result = reportGlobalService.GetReportGlobals(hospitalId);
return new ApiResponse(ResponseType.OK, result);
}
/// <summary>
/// 添加报表配置
/// </summary>
/// <param name="global"></param>
/// <returns></returns>
[HttpPost]
public ApiResponse CreateReportGlobal([FromBody] report_global global)
{
var result = reportGlobalService.CreateReportGlobal(global);
return new ApiResponse(ResponseType.OK, result);
}
/// <summary>
/// 修改报表配置
/// </summary>
/// <param name="global"></param>
/// <returns></returns>
[HttpPost("update")]
public ApiResponse UpdateReportGlobal([FromBody] report_global global)
{
var result = reportGlobalService.UpdateReportGlobal(global);
return new ApiResponse(ResponseType.OK, result);
}
/// <summary>
/// 删除报表配置
/// </summary>
/// <param name="globalId"></param>
/// <returns></returns>
[HttpPost("{globalId}")]
public ApiResponse DeleteReportGlobal([FromRoute] int globalId)
{
var result = reportGlobalService.DeleteReportGlobal(globalId);
return new ApiResponse(ResponseType.OK, result);
}
/// <summary>
/// 上传人员绩效文件 /// 上传人员绩效文件
/// </summary> /// </summary>
/// <param name="hospitalId"></param> /// <param name="hospitalId"></param>
......
performance/Performance.Api/Controllers/SecondAllotController.cs
...@@ -401,11 +401,11 @@ public ApiResponse NursingDeptAuditResult([FromBody] SecondAuditRequest request) ...@@ -401,11 +401,11 @@ public ApiResponse NursingDeptAuditResult([FromBody] SecondAuditRequest request)
[HttpPost] [HttpPost]
public ApiResponse OtherList([FromBody] AgOtherRequest request) public ApiResponse OtherList([FromBody] AgOtherRequest request)
{ {
var result = secondAllotService.OtherList(request.SecondId, claimService.GetUserId()); //var result = secondAllotService.OtherList(request.SecondId, claimService.GetUserId());
//var result = secondAllotDetails.GetOtherTempData(claimService.GetUserId(), request.SecondId, request.IsArchive, request.EmployeeSource, out decimal? realAmount); var result = secondAllotDetails.GetOtherTempData(claimService.GetUserId(), request.SecondId, request.IsArchive, request.EmployeeSource, out decimal? realAmount);
var obj = new var obj = new
{ {
header = secondAllotService.OtherListHeader(request.SecondId, result?.Sum(s => s.RealAmount) ?? 0), header = secondAllotService.OtherListHeader(request.SecondId, realAmount),
body = result, body = result,
}; };
return new ApiResponse(ResponseType.OK, obj); return new ApiResponse(ResponseType.OK, obj);
...@@ -423,13 +423,19 @@ public ApiResponse OtherSave([FromBody] AgOtherRequest request) ...@@ -423,13 +423,19 @@ public ApiResponse OtherSave([FromBody] AgOtherRequest request)
return new ApiResponse(ResponseType.OK, result); return new ApiResponse(ResponseType.OK, result);
} }
//[Route("api/second/other/save/{secondId}")] /// <summary>
//[HttpPost] /// 二次绩效其他绩效保存(new)
//public ApiResponse OtherSave(int secondId, [FromBody] SaveCollectData request) /// </summary>
//{ /// <param name="secondId"></param>
// secondAllotService.OtherSave(secondId, request); /// <param name="request"></param>
// return new ApiResponse(ResponseType.OK); /// <returns></returns>
//} [Route("api/second/other/save/{secondId}")]
[HttpPost]
public ApiResponse OtherSave(int secondId, [FromBody] SaveCollectData request)
{
secondAllotService.OtherSave(secondId, request);
return new ApiResponse(ResponseType.OK);
}
#endregion 二次绩效其他绩效 #endregion 二次绩效其他绩效
......
performance/Performance.Api/Controllers/TemplateController.cs
...@@ -214,18 +214,18 @@ public ApiResponse NewExtractData([CustomizeValidator, FromBody] ExtractRequest ...@@ -214,18 +214,18 @@ public ApiResponse NewExtractData([CustomizeValidator, FromBody] ExtractRequest
else else
{ {
var http = new RestSharpHelper(); var http = new RestSharpHelper();
string endpoint = "extract/extract"; var extractUrl = http.SetUrl(url.HttpPost, "extract/extract");
var extractUrl = http.SetUrl(url.HttpPost, endpoint);
var obj = new var obj = new ExtractRequest
{ {
allotId = request.AllotId, AllotId = request.AllotId,
hospitalId = request.HospitalId, HospitalId = request.HospitalId,
email = email, Email = email,
userId = claim.GetUserId() UserId = claim.GetUserId()
}; };
string json = JsonHelper.Serialize(obj); string json = JsonHelper.Serialize(obj);
logger.LogInformation("提取绩效数据参数:" + json);
var parameter = JsonHelper.Deserialize<Dictionary<string, object>>(json); var parameter = JsonHelper.Deserialize<Dictionary<string, object>>(json);
var restRequest = string.IsNullOrEmpty(filePath) ? http.CreatePostRequest(json) : http.CreateFileRequest(new string[] { filePath }, parameter); var restRequest = string.IsNullOrEmpty(filePath) ? http.CreatePostRequest(json) : http.CreateFileRequest(new string[] { filePath }, parameter);
Task.Run(() => http.GetResponse(extractUrl, restRequest)); Task.Run(() => http.GetResponse(extractUrl, restRequest));
...@@ -290,12 +290,7 @@ public IActionResult DownFile([FromQuery] AllotRequest request) ...@@ -290,12 +290,7 @@ public IActionResult DownFile([FromQuery] AllotRequest request)
[AllowAnonymous] [AllowAnonymous]
public ApiResponse SaveFile() public ApiResponse SaveFile()
{ {
Dictionary<string, object> dict = new Dictionary<string, object>(); string json = JsonHelper.Serialize(Request.Form.ToDictionary());
foreach (var key in Request.Form.Keys)
{
dict.Add(key, Request.Form[key]);
}
string json = JsonHelper.Serialize(dict);
var request = JsonHelper.Deserialize<ExtractRequest>(json); var request = JsonHelper.Deserialize<ExtractRequest>(json);
if (Request.Form.Files == null || !Request.Form.Files.Any()) if (Request.Form.Files == null || !Request.Form.Files.Any())
......
performance/Performance.Api/wwwroot/Performance.Api.xml
...@@ -1094,6 +1094,34 @@ ...@@ -1094,6 +1094,34 @@
<param name="request"></param> <param name="request"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.ReportGlobalController.GetAllReportGlobal(System.Int32)">
<summary>
获取报表配置信息
</summary>
<param name="hospitalId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ReportGlobalController.CreateReportGlobal(Performance.EntityModels.report_global)">
<summary>
添加报表配置
</summary>
<param name="global"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ReportGlobalController.UpdateReportGlobal(Performance.EntityModels.report_global)">
<summary>
修改报表配置
</summary>
<param name="global"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ReportGlobalController.DeleteReportGlobal(System.Int32)">
<summary>
删除报表配置
</summary>
<param name="globalId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ReportGlobalController.Import(System.Int32,Microsoft.AspNetCore.Http.IFormCollection)"> <member name="M:Performance.Api.Controllers.ReportGlobalController.Import(System.Int32,Microsoft.AspNetCore.Http.IFormCollection)">
<summary> <summary>
上传人员绩效文件 上传人员绩效文件
...@@ -1252,6 +1280,14 @@ ...@@ -1252,6 +1280,14 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.SecondAllotController.OtherSave(System.Int32,Performance.DtoModels.SaveCollectData)">
<summary>
二次绩效其他绩效保存(new)
</summary>
<param name="secondId"></param>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.SecondPrint(System.Int32)"> <member name="M:Performance.Api.Controllers.SecondAllotController.SecondPrint(System.Int32)">
<summary> <summary>
二次绩效结果打印 二次绩效结果打印
......
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
...@@ -88,6 +88,9 @@ ...@@ -88,6 +88,9 @@
<member name="P:Performance.EntityModels.PerformanceDbContext.cof_workitem"> <member name="P:Performance.EntityModels.PerformanceDbContext.cof_workitem">
<summary> </summary> <summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.PerformanceDbContext.cof_workloadtype">
<summary> 工作量分类 </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.cof_workyear"> <member name="P:Performance.EntityModels.PerformanceDbContext.cof_workyear">
<summary> 工龄对应绩效系数配置 </summary> <summary> 工龄对应绩效系数配置 </summary>
</member> </member>
...@@ -98,7 +101,7 @@ ...@@ -98,7 +101,7 @@
<summary> </summary> <summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.PerformanceDbContext.cust_script"> <member name="P:Performance.EntityModels.PerformanceDbContext.cust_script">
<summary> </summary> <summary> 自定义导出 </summary>
</member> </member>
<member name="P:Performance.EntityModels.PerformanceDbContext.ex_item"> <member name="P:Performance.EntityModels.PerformanceDbContext.ex_item">
<summary> </summary> <summary> </summary>
...@@ -118,6 +121,12 @@ ...@@ -118,6 +121,12 @@
<member name="P:Performance.EntityModels.PerformanceDbContext.ex_type"> <member name="P:Performance.EntityModels.PerformanceDbContext.ex_type">
<summary> </summary> <summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.PerformanceDbContext.his_data">
<summary> </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.his_script">
<summary> </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.his_importdata"> <member name="P:Performance.EntityModels.PerformanceDbContext.his_importdata">
<summary> </summary> <summary> </summary>
</member> </member>
...@@ -154,6 +163,18 @@ ...@@ -154,6 +163,18 @@
<member name="P:Performance.EntityModels.PerformanceDbContext.mod_dic"> <member name="P:Performance.EntityModels.PerformanceDbContext.mod_dic">
<summary> 部分公共数据抽取SQL </summary> <summary> 部分公共数据抽取SQL </summary>
</member> </member>
<member name="P:Performance.EntityModels.PerformanceDbContext.mod_extract">
<summary> 医院数据提取脚本 </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.mod_item">
<summary> </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.mod_module">
<summary> </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.mod_special">
<summary> </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.per_againallot"> <member name="P:Performance.EntityModels.PerformanceDbContext.per_againallot">
<summary> </summary> <summary> </summary>
</member> </member>
...@@ -202,6 +223,21 @@ ...@@ -202,6 +223,21 @@
<member name="P:Performance.EntityModels.PerformanceDbContext.report_global"> <member name="P:Performance.EntityModels.PerformanceDbContext.report_global">
<summary> </summary> <summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.PerformanceDbContext.report_original_persontime">
<summary> 医院门诊住院人次 </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.report_original_stays">
<summary> 医院门诊住院人次 </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.report_original_surgery">
<summary> 医院手术人次 </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.report_original_workload">
<summary> </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.report_performance">
<summary> </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.res_account"> <member name="P:Performance.EntityModels.PerformanceDbContext.res_account">
<summary> 科室核算结果 </summary> <summary> 科室核算结果 </summary>
</member> </member>
...@@ -351,6 +387,11 @@ ...@@ -351,6 +387,11 @@
二次绩效ID 二次绩效ID
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.ag_compute.UnitType">
<summary>
科室类型
</summary>
</member>
<member name="P:Performance.EntityModels.ag_compute.Department"> <member name="P:Performance.EntityModels.ag_compute.Department">
<summary> <summary>
科室 科室
...@@ -376,6 +417,11 @@ ...@@ -376,6 +417,11 @@
可分配绩效 可分配绩效
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.ag_compute.PerforManagementFee">
<summary>
管理绩效
</summary>
</member>
<member name="P:Performance.EntityModels.ag_compute.OthePerfor"> <member name="P:Performance.EntityModels.ag_compute.OthePerfor">
<summary> <summary>
医院其他绩效 医院其他绩效
...@@ -383,7 +429,7 @@ ...@@ -383,7 +429,7 @@
</member> </member>
<member name="P:Performance.EntityModels.ag_compute.NightWorkPerfor"> <member name="P:Performance.EntityModels.ag_compute.NightWorkPerfor">
<summary> <summary>
实发绩效工资金额 夜班工作量绩效
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.ag_compute.RealGiveFee"> <member name="P:Performance.EntityModels.ag_compute.RealGiveFee">
...@@ -836,6 +882,26 @@ ...@@ -836,6 +882,26 @@
科室实发金额 科室实发金额
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.ag_secondallot.Efficiency">
<summary>
效率绩效
</summary>
</member>
<member name="P:Performance.EntityModels.ag_secondallot.Scale">
<summary>
规模绩效
</summary>
</member>
<member name="P:Performance.EntityModels.ag_secondallot.Grant">
<summary>
发放系数
</summary>
</member>
<member name="P:Performance.EntityModels.ag_secondallot.ShouldGiveFee">
<summary>
应发管理绩效
</summary>
</member>
<member name="P:Performance.EntityModels.ag_secondallot.Status"> <member name="P:Performance.EntityModels.ag_secondallot.Status">
<summary> <summary>
状态 1 未提交 2 等待审核 3 审核通过 4 驳回 状态 1 未提交 2 等待审核 3 审核通过 4 驳回
...@@ -866,11 +932,6 @@ ...@@ -866,11 +932,6 @@
备注 备注
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.ag_secondallot.NursingDeptStatus">
<summary>
护理部审核状态 1 未提交 2 等待审核 3 审核通过 4 驳回
</summary>
</member>
<member name="P:Performance.EntityModels.ag_secondallot.NursingDeptAuditTime"> <member name="P:Performance.EntityModels.ag_secondallot.NursingDeptAuditTime">
<summary> <summary>
护理部审核时间 护理部审核时间
...@@ -886,6 +947,11 @@ ...@@ -886,6 +947,11 @@
护理部备注 护理部备注
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.ag_secondallot.NursingDeptStatus">
<summary>
护理部审核状态 2 等待审核 3 审核通过 4 驳回
</summary>
</member>
<member name="T:Performance.EntityModels.ag_temp"> <member name="T:Performance.EntityModels.ag_temp">
<summary> <summary>
二次绩效模板 二次绩效模板
...@@ -1466,6 +1532,36 @@ ...@@ -1466,6 +1532,36 @@
1. 药占比 2. CMI 1. 药占比 2. CMI
</summary> </summary>
</member> </member>
<member name="T:Performance.EntityModels.cof_workloadtype">
<summary>
工作量分类
</summary>
</member>
<member name="P:Performance.EntityModels.cof_workloadtype.ID">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.cof_workloadtype.AllotID">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.cof_workloadtype.SourceType">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.cof_workloadtype.Original">
<summary>
名称
</summary>
</member>
<member name="P:Performance.EntityModels.cof_workloadtype.Category">
<summary>
类别
</summary>
</member>
<member name="T:Performance.EntityModels.cof_workyear"> <member name="T:Performance.EntityModels.cof_workyear">
<summary> <summary>
工龄对应绩效系数配置 工龄对应绩效系数配置
...@@ -1498,7 +1594,7 @@ ...@@ -1498,7 +1594,7 @@
</member> </member>
<member name="T:Performance.EntityModels.collect_data"> <member name="T:Performance.EntityModels.collect_data">
<summary> <summary>
采集数据
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.collect_data.ID"> <member name="P:Performance.EntityModels.collect_data.ID">
...@@ -1518,7 +1614,7 @@ ...@@ -1518,7 +1614,7 @@
</member> </member>
<member name="P:Performance.EntityModels.collect_data.UnitType"> <member name="P:Performance.EntityModels.collect_data.UnitType">
<summary> <summary>
核算单元类别 1 医生组 2护理组 3医技组
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.collect_data.RowNumber"> <member name="P:Performance.EntityModels.collect_data.RowNumber">
...@@ -1538,17 +1634,17 @@ ...@@ -1538,17 +1634,17 @@
</member> </member>
<member name="P:Performance.EntityModels.collect_data.AccountingUnitTechnician"> <member name="P:Performance.EntityModels.collect_data.AccountingUnitTechnician">
<summary> <summary>
核算单元名称 医技 核算单元名称医技
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.collect_data.AccountingUnitNurse"> <member name="P:Performance.EntityModels.collect_data.AccountingUnitNurse">
<summary> <summary>
核算单元名称 护士 核算单元名称护士
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.collect_data.AccountingUnitDoctor"> <member name="P:Performance.EntityModels.collect_data.AccountingUnitDoctor">
<summary> <summary>
核算单元名称 医生 核算单元名称医生
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.collect_data.Department"> <member name="P:Performance.EntityModels.collect_data.Department">
...@@ -1571,7 +1667,7 @@ ...@@ -1571,7 +1667,7 @@
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.collect_permission.ID"> <member name="P:Performance.EntityModels.collect_permission.Id">
<summary> <summary>
</summary> </summary>
...@@ -1586,9 +1682,14 @@ ...@@ -1586,9 +1682,14 @@
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.collect_permission.SheetType">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.collect_permission.SheetName"> <member name="P:Performance.EntityModels.collect_permission.SheetName">
<summary> <summary>
列头类型名称
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.collect_permission.HeadName"> <member name="P:Performance.EntityModels.collect_permission.HeadName">
...@@ -1596,19 +1697,19 @@ ...@@ -1596,19 +1697,19 @@
列头名称 列头名称
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.collect_permission.Readnoly"> <member name="P:Performance.EntityModels.collect_permission.Visible">
<summary> <summary>
0 可读可写 1 只读 0 可见 1 只读
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.collect_permission.AttachLast"> <member name="P:Performance.EntityModels.collect_permission.Readnoly">
<summary> <summary>
是否附带上次绩效 0 不附带 1 附带 0 可读可写 1 只读
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.collect_permission.Visible"> <member name="P:Performance.EntityModels.collect_permission.AttachLast">
<summary> <summary>
0 可见 1 不可见 是否附带上次绩效 0 附带 1 不附带
</summary> </summary>
</member> </member>
<member name="T:Performance.EntityModels.cust_script"> <member name="T:Performance.EntityModels.cust_script">
...@@ -1616,7 +1717,7 @@ ...@@ -1616,7 +1717,7 @@
自定义导出 自定义导出
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.cust_script.ID"> <member name="P:Performance.EntityModels.cust_script.Id">
<summary> <summary>
</summary> </summary>
...@@ -1636,6 +1737,16 @@ ...@@ -1636,6 +1737,16 @@
是否允许二次分配下载 1 允许 2 禁止 是否允许二次分配下载 1 允许 2 禁止
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.cust_script.Name">
<summary>
名称
</summary>
</member>
<member name="P:Performance.EntityModels.cust_script.Script">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.cust_script.ConfigId"> <member name="P:Performance.EntityModels.cust_script.ConfigId">
<summary> <summary>
配置Id 配置Id
...@@ -1916,6 +2027,91 @@ ...@@ -1916,6 +2027,91 @@
来源 来源
</summary> </summary>
</member> </member>
<member name="T:Performance.EntityModels.his_data">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.his_data.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.his_data.HospitalId">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.his_data.AllotId">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.his_data.Year">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.his_data.Month">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.his_data.HisDepartment">
<summary>
His科室
</summary>
</member>
<member name="P:Performance.EntityModels.his_data.AccountingUnit">
<summary>
核算单元
</summary>
</member>
<member name="P:Performance.EntityModels.his_data.Department">
<summary>
科室
</summary>
</member>
<member name="P:Performance.EntityModels.his_data.PersonnelName">
<summary>
医生姓名
</summary>
</member>
<member name="P:Performance.EntityModels.his_data.PersonnelNumber">
<summary>
人员工号
</summary>
</member>
<member name="P:Performance.EntityModels.his_data.SourceType">
<summary>
来源
</summary>
</member>
<member name="P:Performance.EntityModels.his_data.Category">
<summary>
费用类型
</summary>
</member>
<member name="P:Performance.EntityModels.his_data.Original">
<summary>
原始分类
</summary>
</member>
<member name="P:Performance.EntityModels.his_data.ItemName">
<summary>
标准分类
</summary>
</member>
<member name="P:Performance.EntityModels.his_data.Value">
<summary>
费用
</summary>
</member>
<member name="P:Performance.EntityModels.his_data.CreateTime">
<summary>
创建时间
</summary>
</member>
<member name="T:Performance.EntityModels.his_importdata"> <member name="T:Performance.EntityModels.his_importdata">
<summary> <summary>
...@@ -1991,6 +2187,51 @@ ...@@ -1991,6 +2187,51 @@
值 值
</summary> </summary>
</member> </member>
<member name="T:Performance.EntityModels.his_script">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.his_script.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.his_script.HospitalId">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.his_script.SourceType">
<summary>
来源
</summary>
</member>
<member name="P:Performance.EntityModels.his_script.Category">
<summary>
费用类型
</summary>
</member>
<member name="P:Performance.EntityModels.his_script.ExecScript">
<summary>
执行sql
</summary>
</member>
<member name="P:Performance.EntityModels.his_script.DatabaseType">
<summary>
数据库类型1、Sql Server 2、Orcale
</summary>
</member>
<member name="P:Performance.EntityModels.his_script.ConfigId">
<summary>
配置Id
</summary>
</member>
<member name="P:Performance.EntityModels.his_script.IsEnable">
<summary>
是否可用 1 可用 2 不可用
</summary>
</member>
<member name="T:Performance.EntityModels.hos_personfee"> <member name="T:Performance.EntityModels.hos_personfee">
<summary> <summary>
...@@ -2206,24 +2447,24 @@ ...@@ -2206,24 +2447,24 @@
行号 行号
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.im_data.AccountingUnit"> <member name="P:Performance.EntityModels.im_data.EmployeeName">
<summary> <summary>
核算单元名称 人员姓名
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.im_data.Department"> <member name="P:Performance.EntityModels.im_data.JobNumber">
<summary> <summary>
科室名称 人员工号
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.im_data.EmployeeName"> <member name="P:Performance.EntityModels.im_data.AccountingUnit">
<summary> <summary>
人员姓名 核算单元名称
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.im_data.JobNumber"> <member name="P:Performance.EntityModels.im_data.Department">
<summary> <summary>
人员工号 科室名称
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.im_data.TypeName"> <member name="P:Performance.EntityModels.im_data.TypeName">
...@@ -2386,6 +2627,21 @@ ...@@ -2386,6 +2627,21 @@
其他绩效 其他绩效
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.im_employee.OtherPerfor2">
<summary>
其他绩效2
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee.OtherPerfor3">
<summary>
其他绩效3
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee.OtherPerfor4">
<summary>
其他绩效4
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee.NightWorkPerfor"> <member name="P:Performance.EntityModels.im_employee.NightWorkPerfor">
<summary> <summary>
夜班费 夜班费
...@@ -2491,21 +2747,11 @@ ...@@ -2491,21 +2747,11 @@
基础绩效系数 基础绩效系数
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.im_employee_clinic.FitPeopleValue">
<summary>
实际人均绩效
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.PostCoefficient"> <member name="P:Performance.EntityModels.im_employee_clinic.PostCoefficient">
<summary> <summary>
岗位系数 岗位系数
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.im_employee_clinic.PermanentStaff">
<summary>
效率绩效人数
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.Efficiency"> <member name="P:Performance.EntityModels.im_employee_clinic.Efficiency">
<summary> <summary>
效率绩效系数 效率绩效系数
...@@ -2521,11 +2767,6 @@ ...@@ -2521,11 +2767,6 @@
管理绩效发放系数 管理绩效发放系数
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.im_employee_clinic.OtherManagePerfor">
<summary>
其他管理绩效
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.ScoreAverageRate"> <member name="P:Performance.EntityModels.im_employee_clinic.ScoreAverageRate">
<summary> <summary>
考核得分率 考核得分率
...@@ -2551,6 +2792,16 @@ ...@@ -2551,6 +2792,16 @@
其他绩效 其他绩效
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.im_employee_clinic.OtherManagePerfor">
<summary>
其他管理绩效
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.NightWorkPerfor">
<summary>
夜班费
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.Punishment"> <member name="P:Performance.EntityModels.im_employee_clinic.Punishment">
<summary> <summary>
医院奖罚 医院奖罚
...@@ -2576,12 +2827,22 @@ ...@@ -2576,12 +2827,22 @@
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.im_employee_clinic.AssessBeforeOtherFee"> <member name="P:Performance.EntityModels.im_employee_clinic.PermanentStaff">
<summary> <summary>
考核前其他绩效 效率绩效人数
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.im_employee_clinic.AssessLaterOtherFee"> <member name="P:Performance.EntityModels.im_employee_clinic.FitPeopleValue">
<summary>
实际人均绩效
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.AssessBeforeOtherFee">
<summary>
考核前其他绩效
</summary>
</member>
<member name="P:Performance.EntityModels.im_employee_clinic.AssessLaterOtherFee">
<summary> <summary>
考核后其他绩效 考核后其他绩效
</summary> </summary>
...@@ -2653,7 +2914,7 @@ ...@@ -2653,7 +2914,7 @@
</member> </member>
<member name="P:Performance.EntityModels.im_employee_logistics.DoctorName"> <member name="P:Performance.EntityModels.im_employee_logistics.DoctorName">
<summary> <summary>
医生姓名 姓名
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.im_employee_logistics.JobTitle"> <member name="P:Performance.EntityModels.im_employee_logistics.JobTitle">
...@@ -2976,6 +3237,201 @@ ...@@ -2976,6 +3237,201 @@
</summary> </summary>
</member> </member>
<member name="T:Performance.EntityModels.mod_extract">
<summary>
医院数据提取脚本
</summary>
</member>
<member name="P:Performance.EntityModels.mod_extract.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_extract.HospitalId">
<summary>
医院ID
</summary>
</member>
<member name="P:Performance.EntityModels.mod_extract.EName">
<summary>
当前脚本提取内容名称
</summary>
</member>
<member name="P:Performance.EntityModels.mod_extract.ExecuteScript">
<summary>
执行脚本
</summary>
</member>
<member name="P:Performance.EntityModels.mod_extract.ExecuteType">
<summary>
当前脚本类型 1 收入整表 2 单项数据提取
</summary>
</member>
<member name="P:Performance.EntityModels.mod_extract.SourceType">
<summary>
数据库来源类型 1 标准库 2 绩效库
</summary>
</member>
<member name="P:Performance.EntityModels.mod_extract.Description">
<summary>
描述
</summary>
</member>
<member name="P:Performance.EntityModels.mod_extract.IsEnable">
<summary>
是否可用 1 可用 2 不可用
</summary>
</member>
<member name="T:Performance.EntityModels.mod_item">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.ModuleId">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.ItemName">
<summary>
绩效考核项
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.FactorValue1">
<summary>
默认系数或医生系数
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.FactorValue2">
<summary>
护理系数
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.FactorValue3">
<summary>
医技系数
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.ExtractId">
<summary>
抽取绩效值SQL
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.ConfigId">
<summary>
数据库地址
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.SelectionRange">
<summary>
用户选定抽取范围
</summary>
</member>
<member name="P:Performance.EntityModels.mod_item.ReadOnly">
<summary>
只读 0、否 1、是
</summary>
</member>
<member name="T:Performance.EntityModels.mod_module">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.HospitalId">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.SheetType">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.ModuleName">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.Description">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.ExtractId">
<summary>
提取脚本ID
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.ConfigId">
<summary>
数据库地址
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.ReadOnly">
<summary>
只读 0、否 1、是
</summary>
</member>
<member name="P:Performance.EntityModels.mod_module.IsGenerated">
<summary>
是否生成Item 0、否 1、是
</summary>
</member>
<member name="T:Performance.EntityModels.mod_special">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_special.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_special.HospitalId">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.mod_special.Department">
<summary>
科室
</summary>
</member>
<member name="P:Performance.EntityModels.mod_special.Target">
<summary>
量化指标
</summary>
</member>
<member name="P:Performance.EntityModels.mod_special.TargetFactor">
<summary>
量化指标绩效分值
</summary>
</member>
<member name="P:Performance.EntityModels.mod_special.AdjustFactor">
<summary>
调节系数
</summary>
</member>
<member name="P:Performance.EntityModels.mod_special.ExtractId">
<summary>
抽取绩效值SQL
</summary>
</member>
<member name="P:Performance.EntityModels.mod_special.ConfigId">
<summary>
数据库地址
</summary>
</member>
<member name="T:Performance.EntityModels.per_againallot"> <member name="T:Performance.EntityModels.per_againallot">
<summary> <summary>
...@@ -3171,11 +3627,6 @@ ...@@ -3171,11 +3627,6 @@
审核人 审核人
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.per_apr_amount.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Performance.EntityModels.per_apr_amount.CreateDate"> <member name="P:Performance.EntityModels.per_apr_amount.CreateDate">
<summary> <summary>
...@@ -3186,6 +3637,11 @@ ...@@ -3186,6 +3637,11 @@
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.per_apr_amount.Remark">
<summary>
备注
</summary>
</member>
<member name="T:Performance.EntityModels.per_budget_amount"> <member name="T:Performance.EntityModels.per_budget_amount">
<summary> <summary>
预算管理金额 预算管理金额
...@@ -3708,7 +4164,7 @@ ...@@ -3708,7 +4164,7 @@
</member> </member>
<member name="P:Performance.EntityModels.per_employee.UnitType"> <member name="P:Performance.EntityModels.per_employee.UnitType">
<summary> <summary>
人员类别 核算单元类别
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.per_employee.Attendance"> <member name="P:Performance.EntityModels.per_employee.Attendance">
...@@ -3838,7 +4294,7 @@ ...@@ -3838,7 +4294,7 @@
</member> </member>
<member name="T:Performance.EntityModels.report_global"> <member name="T:Performance.EntityModels.report_global">
<summary> <summary>
条件表
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.report_global.Id"> <member name="P:Performance.EntityModels.report_global.Id">
...@@ -3856,27 +4312,27 @@ ...@@ -3856,27 +4312,27 @@
类别 类别
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.report_global.Type"> <member name="P:Performance.EntityModels.report_global.Year">
<summary> <summary>
年 年份
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.report_global.InputName"> <member name="P:Performance.EntityModels.report_global.Month">
<summary> <summary>
月 月份
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.report_global.InputType"> <member name="P:Performance.EntityModels.report_global.Value">
<summary> <summary>
值 值
</summary> </summary>
</member> </member>
<member name="T:Performance.EntityModels.report_original_persontime"> <member name="T:Performance.EntityModels.report_original_persontime">
<summary> <summary>
医院门诊住院人次
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.report_original_persontime.Id"> <member name="P:Performance.EntityModels.report_original_persontime.ID">
<summary> <summary>
</summary> </summary>
...@@ -3923,10 +4379,10 @@ ...@@ -3923,10 +4379,10 @@
</member> </member>
<member name="T:Performance.EntityModels.report_original_stays"> <member name="T:Performance.EntityModels.report_original_stays">
<summary> <summary>
医院门诊住院人次
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.report_original_stays.Id"> <member name="P:Performance.EntityModels.report_original_stays.ID">
<summary> <summary>
</summary> </summary>
...@@ -3973,10 +4429,10 @@ ...@@ -3973,10 +4429,10 @@
</member> </member>
<member name="T:Performance.EntityModels.report_original_surgery"> <member name="T:Performance.EntityModels.report_original_surgery">
<summary> <summary>
医院手术人次
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.report_original_surgery.Id"> <member name="P:Performance.EntityModels.report_original_surgery.ID">
<summary> <summary>
</summary> </summary>
...@@ -4086,6 +4542,91 @@ ...@@ -4086,6 +4542,91 @@
费用 费用
</summary> </summary>
</member> </member>
<member name="T:Performance.EntityModels.report_performance">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.HospitalId">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.Year">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.Month">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.PersonnelName">
<summary>
人员信息
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.PersonnelNumber">
<summary>
人员工号
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.AccountingUnit">
<summary>
核算单元
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.Department">
<summary>
医院科室
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.UnitType">
<summary>
核算单元类型
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.SourceType">
<summary>
统计分类
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.Category">
<summary>
统计大分类
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.ItemName">
<summary>
统计小分类
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.CurrentValue">
<summary>
本期
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.LastIssueValue">
<summary>
上期
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.SamePeriodValue">
<summary>
同期
</summary>
</member>
<member name="P:Performance.EntityModels.report_performance.BudgetValue">
<summary>
预算
</summary>
</member>
<member name="T:Performance.EntityModels.rep_group"> <member name="T:Performance.EntityModels.rep_group">
<summary> <summary>
...@@ -4206,6 +4747,16 @@ ...@@ -4206,6 +4747,16 @@
报表标题 报表标题
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.rep_report.QueryName">
<summary>
查询方法名称
</summary>
</member>
<member name="P:Performance.EntityModels.rep_report.QueryArguments">
<summary>
查询参数
</summary>
</member>
<member name="P:Performance.EntityModels.rep_report.XTitle"> <member name="P:Performance.EntityModels.rep_report.XTitle">
<summary> <summary>
X轴标题 X轴标题
...@@ -4381,6 +4932,16 @@ ...@@ -4381,6 +4932,16 @@
是否带入平均计算 是 否 是否带入平均计算 是 否
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.res_account.PermanentStaff">
<summary>
定科人数
</summary>
</member>
<member name="P:Performance.EntityModels.res_account.ManagerNumber">
<summary>
科主任/护士长数量
</summary>
</member>
<member name="P:Performance.EntityModels.res_account.Number"> <member name="P:Performance.EntityModels.res_account.Number">
<summary> <summary>
核算单元医生数量 核算单元医生数量
...@@ -4481,6 +5042,16 @@ ...@@ -4481,6 +5042,16 @@
实发绩效 实发绩效
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.res_account.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Performance.EntityModels.res_account.ChangeLog">
<summary>
变更日志
</summary>
</member>
<member name="P:Performance.EntityModels.res_account.AssessBeforeOtherFee"> <member name="P:Performance.EntityModels.res_account.AssessBeforeOtherFee">
<summary> <summary>
考核前其他绩效 考核前其他绩效
...@@ -4501,16 +5072,6 @@ ...@@ -4501,16 +5072,6 @@
考核后绩效 考核后绩效
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.res_account.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Performance.EntityModels.res_account.ChangeLog">
<summary>
变更日志
</summary>
</member>
<member name="T:Performance.EntityModels.res_accountdoctor"> <member name="T:Performance.EntityModels.res_accountdoctor">
<summary> <summary>
医生科室核算结果 医生科室核算结果
...@@ -4808,12 +5369,12 @@ ...@@ -4808,12 +5369,12 @@
</member> </member>
<member name="P:Performance.EntityModels.res_compute.FitPeopleValue"> <member name="P:Performance.EntityModels.res_compute.FitPeopleValue">
<summary> <summary>
绩效基础核算参考值
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.res_compute.FitPeopleRatio"> <member name="P:Performance.EntityModels.res_compute.FitPeopleRatio">
<summary> <summary>
绩效基数核算参考对象取值比例（如临床科室护士*95%）
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.res_compute.EmployeeName"> <member name="P:Performance.EntityModels.res_compute.EmployeeName">
...@@ -4846,6 +5407,11 @@ ...@@ -4846,6 +5407,11 @@
人均绩效(来自科室经济测算表) 人均绩效(来自科室经济测算表)
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.res_compute.Basics">
<summary>
基础绩效系数
</summary>
</member>
<member name="P:Performance.EntityModels.res_compute.Efficiency"> <member name="P:Performance.EntityModels.res_compute.Efficiency">
<summary> <summary>
效率绩效(需计算) 效率绩效(需计算)
...@@ -4891,6 +5457,26 @@ ...@@ -4891,6 +5457,26 @@
其他绩效(来自人员名单) 其他绩效(来自人员名单)
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.res_compute.OtherPerfor2">
<summary>
其他绩效2(来自人员名单)
</summary>
</member>
<member name="P:Performance.EntityModels.res_compute.OtherPerfor3">
<summary>
其他绩效3(来自人员名单)
</summary>
</member>
<member name="P:Performance.EntityModels.res_compute.OtherPerfor4">
<summary>
其他绩效4(来自人员名单)
</summary>
</member>
<member name="P:Performance.EntityModels.res_compute.OtherManagePerfor">
<summary>
其他管理绩效(来自人员名单)
</summary>
</member>
<member name="P:Performance.EntityModels.res_compute.NightWorkPerfor"> <member name="P:Performance.EntityModels.res_compute.NightWorkPerfor">
<summary> <summary>
夜班费 夜班费
...@@ -4951,11 +5537,6 @@ ...@@ -4951,11 +5537,6 @@
科主任/护士长人数 科主任/护士长人数
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.res_compute.OtherManagePerfor">
<summary>
其他管理绩效
</summary>
</member>
<member name="P:Performance.EntityModels.res_compute.MedicalNumber"> <member name="P:Performance.EntityModels.res_compute.MedicalNumber">
<summary> <summary>
核算单元人员数量 核算单元人员数量
...@@ -5001,6 +5582,11 @@ ...@@ -5001,6 +5582,11 @@
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.res_reserved.UnitType">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.res_reserved.AccountingUnit"> <member name="P:Performance.EntityModels.res_reserved.AccountingUnit">
<summary> <summary>
核算单元 核算单元
......
performance/Performance.DtoModels/Request/SecondEmpRequest.cs
...@@ -14,8 +14,8 @@ public class SecondEmpRequest ...@@ -14,8 +14,8 @@ public class SecondEmpRequest
public string EmployeeName { get; set; } public string EmployeeName { get; set; }
public string JobNumber { get; set; } public string JobNumber { get; set; }
} }
public class SecondEmpRequestValidator : AbstractValidator<SecondEmpRequest> public class SecondEmpRequestValidator : AbstractValidator<SecondEmpRequest>
{ {
public SecondEmpRequestValidator() public SecondEmpRequestValidator()
......
performance/Performance.Extract.Api/Controllers/ExtractController.cs
...@@ -44,16 +44,11 @@ public class ExtractController : Controller ...@@ -44,16 +44,11 @@ public class ExtractController : Controller
[HttpPost] [HttpPost]
public void ExtractData() public void ExtractData()
{ {
Dictionary<string, object> dict = new Dictionary<string, object>(); string json = JsonHelper.Serialize(Request.Form.ToDictionary());
foreach (var key in Request.Form.Keys)
{
dict.Add(key, Request.Form[key]);
}
string json = JsonHelper.Serialize(dict);
var request = JsonHelper.Deserialize<ExtractRequest>(json);
logger.LogInformation("提取绩效数据请求参数：" + json); logger.LogInformation("提取绩效数据请求参数：" + json);
var request = JsonHelper.Deserialize<ExtractRequest>(json);
if (request == null || request.AllotId == 0 || request.HospitalId == 0) if (request == null || request.AllotId == 0 || request.HospitalId == 0)
return; return;
...@@ -109,8 +104,7 @@ private string SaveFileAsTemplate(IFormFile file, int hospitalId) ...@@ -109,8 +104,7 @@ private string SaveFileAsTemplate(IFormFile file, int hospitalId)
private void ImportFileAsAllotExtractFile(int allotId, int hospitalId, string filePath) private void ImportFileAsAllotExtractFile(int allotId, int hospitalId, string filePath)
{ {
var http = new RestSharpHelper(); var http = new RestSharpHelper();
string endpoint = "template/savefile"; var importUrl = http.SetUrl(options.ImportFile, "template/savefile");
var importUrl = http.SetUrl(options.ImportFile, endpoint);
var obj = new { allotId, hospitalId }; var obj = new { allotId, hospitalId };
......
performance/Performance.Services/ReportGlobalService.cs
...@@ -32,12 +32,124 @@ PerforHisimportdataRepository hisimportdataRepository ...@@ -32,12 +32,124 @@ PerforHisimportdataRepository hisimportdataRepository
this.hisimportdataRepository = hisimportdataRepository; this.hisimportdataRepository = hisimportdataRepository;
} }
#region Report_Global
public List<report_global> GetReportGlobals(int hospitalId) public List<report_global> GetReportGlobals(int hospitalId)
{ {
var globals = reportglobalRepository.GetEntities(t => t.HospitalID == hospitalId); var globals = reportglobalRepository.GetEntities(t => t.HospitalID == hospitalId)
?.OrderBy(t => t.Category).ThenBy(t => t.Year).ThenBy(t => t.Month).ToList();
return globals; return globals;
} }
public bool CreateReportGlobal(report_global global)
{
return reportglobalRepository.Add(global);
}
public bool UpdateReportGlobal(report_global global)
{
var entity = reportglobalRepository.GetEntity(t => t.Id == global.Id);
entity.Year = global.Year;
entity.Month = global.Month;
entity.Category = global.Category;
entity.Value = global.Value;
return reportglobalRepository.Update(entity);
}
public bool DeleteReportGlobal(int globalId)
{
var entity = reportglobalRepository.GetEntity(t => t.Id == globalId);
return reportglobalRepository.Remove(entity);
}
#endregion Report_Global
#region Copy Previous Report Data
public void CopyPreviousGlobalData(per_allot allot)
{
var globals = reportglobalRepository.GetEntities(t => t.HospitalID == allot.HospitalId);
if (globals == null || !globals.Any()) return;
var onlyYears = globals.Where(t => t.Year.HasValue && !t.Month.HasValue);
if (onlyYears != null && onlyYears.Any())
{
var year = onlyYears.Where(t => t.Year < allot.Year)?.Max(t => t.Year);
if (year.HasValue)
{
var current = onlyYears.Where(t => t.Year == allot.Year)?.ToList() ?? new List<report_global>();
var previous = onlyYears.Where(t => t.Year == year)?.ToList() ?? new List<report_global>();
var newdata = previous.Where(t => !current.Select(s => s.Category).Contains(t.Category))?.ToList();
if (newdata != null && newdata.Any())
{
newdata = newdata.Select(t => new report_global
{
HospitalID = allot.HospitalId,
Year = allot.Year,
Category = t.Category,
Value = t.Value
}).ToList();
reportglobalRepository.AddRange(newdata.ToArray());
}
}
}
var yearAndMonth = globals.Where(t => t.Year.HasValue && t.Month.HasValue);
if (yearAndMonth != null && yearAndMonth.Any())
{
var month = yearAndMonth.Where(t => t.Year == allot.Year && t.Month < allot.Month)?.Max(t => t.Month);
if (allot.Month == 1 || !month.HasValue)
{
var year = yearAndMonth.Where(t => t.Year < allot.Year)?.Max(t => t.Year);
month = yearAndMonth.Where(t => t.Year == year)?.Max(t => t.Month);
if (year.HasValue && month.HasValue)
{
var current = yearAndMonth.Where(t => t.Year == allot.Year && t.Month == allot.Month)?.ToList() ?? new List<report_global>();
var previous = yearAndMonth.Where(t => t.Year == year && t.Month == month)?.ToList() ?? new List<report_global>();
var newdata = previous.Where(t => !current.Select(s => s.Category).Contains(t.Category))?.ToList();
if (newdata != null && newdata.Any())
{
newdata = newdata.Select(t => new report_global
{
HospitalID = allot.HospitalId,
Year = allot.Year,
Month = allot.Month,
Category = t.Category,
Value = t.Value
}).ToList();
reportglobalRepository.AddRange(newdata.ToArray());
}
}
}
else
{
if (month.HasValue)
{
var current = yearAndMonth.Where(t => t.Year == allot.Year && t.Month == allot.Month)?.ToList() ?? new List<report_global>();
var previous = yearAndMonth.Where(t => t.Year == allot.Year && t.Month == month)?.ToList() ?? new List<report_global>();
var newdata = previous.Where(t => !current.Select(s => s.Category).Contains(t.Category))?.ToList();
if (newdata != null && newdata.Any())
{
newdata = newdata.Select(t => new report_global
{
HospitalID = allot.HospitalId,
Year = allot.Year,
Month = allot.Month,
Category = t.Category,
Value = t.Value
}).ToList();
reportglobalRepository.AddRange(newdata.ToArray());
}
}
}
}
}
#endregion Copy Previous Report Data
#region ImportFile && SaveData #region ImportFile && SaveData
public void ImportAllotData(int hospitalId, string filePath) public void ImportAllotData(int hospitalId, string filePath)
......
performance/Performance.Services/SecondAllotService.cs
...@@ -1700,14 +1700,20 @@ public void OtherSave(int secondId, SaveCollectData collectData) ...@@ -1700,14 +1700,20 @@ public void OtherSave(int secondId, SaveCollectData collectData)
} }
if (parameters == null || !parameters.Any()) return; if (parameters == null || !parameters.Any()) return;
List<string> josn = new List<string>(); List<Dictionary<string, object>> result = new List<Dictionary<string, object>>();
foreach (var item in collectData.Data) foreach (var item in collectData.Data)
{ {
var list = item.ToList(); var list = item.ToList();
var itemList = list.Select(t => $"\"{parameters[list.IndexOf(t)]}\":\"{t}\""); Dictionary<string, object> dict = new Dictionary<string, object>();
josn.Add($"{{{string.Join(",", itemList)}}}"); parameters.ForEach(t =>
{
dict.Add(t, list[parameters.IndexOf(t)]);
});
result.Add(dict);
} }
var data = JsonHelper.Deserialize<List<ag_othersource>>($"[{string.Join(",", josn)}]");
var json = JsonHelper.Serialize(result);
var data = JsonHelper.Deserialize<List<ag_othersource>>(json);
data = data.Where(t => !string.IsNullOrEmpty(t.WorkNumber) || !string.IsNullOrEmpty(t.Name))?.ToList(); data = data.Where(t => !string.IsNullOrEmpty(t.WorkNumber) || !string.IsNullOrEmpty(t.Name))?.ToList();
if (data == null || !data.Any()) return; if (data == null || !data.Any()) return;
......
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