Skip to content

P
performance
Commit 4626e9eb by lcx
Options

大屏数据导入bug修改

parent 489d61a5
Showing with 135 additions and 11 deletions
performance/Performance.Api/wwwroot/Performance.Api.xml
...@@ -110,6 +110,33 @@ ...@@ -110,6 +110,33 @@
<param name="userId">用户id</param> <param name="userId">用户id</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.AccountController.SelfInfos">
<summary>
查询用户信息
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.AccountController.InsertUser(Performance.DtoModels.UserRequest)">
<summary>
新增用户
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.AccountController.UpdateUser(Performance.DtoModels.UserRequest)">
<summary>
编辑用户
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.AccountController.DeleteUser(Performance.DtoModels.UserRequest)">
<summary>
新增用户
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="T:Performance.Api.Controllers.AgainAllotController"> <member name="T:Performance.Api.Controllers.AgainAllotController">
<summary> <summary>
科室二次分配 科室二次分配
...@@ -177,6 +204,13 @@ ...@@ -177,6 +204,13 @@
<param name="form"></param> <param name="form"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.AllotController.ImportExtraction(System.Int32)">
<summary>
上传文件
</summary>
<param name="form"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.AllotController.Generate(Performance.DtoModels.AllotRequest)"> <member name="M:Performance.Api.Controllers.AllotController.Generate(Performance.DtoModels.AllotRequest)">
<summary> <summary>
绩效生成 绩效生成
......
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
...@@ -2333,6 +2333,11 @@ ...@@ -2333,6 +2333,11 @@
角色 角色
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.UserRequest.RoleArr">
<summary>
角色Arr
</summary>
</member>
<member name="P:Performance.DtoModels.UserRequest.HosIDArray"> <member name="P:Performance.DtoModels.UserRequest.HosIDArray">
<summary> <summary>
用户医院ID 用户医院ID
......
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
...@@ -763,14 +763,14 @@ ...@@ -763,14 +763,14 @@
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.ag_othersource.Id"> <member name="P:Performance.EntityModels.ag_othersource.Id">
<summary> <summary>
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.ag_othersource.SecondId"> <member name="P:Performance.EntityModels.ag_othersource.SecondId">
<summary> <summary>
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.ag_othersource.WorkNumber"> <member name="P:Performance.EntityModels.ag_othersource.WorkNumber">
<summary> <summary>
...@@ -804,7 +804,7 @@ ...@@ -804,7 +804,7 @@
</member> </member>
<member name="P:Performance.EntityModels.ag_othersource.DeptReward"> <member name="P:Performance.EntityModels.ag_othersource.DeptReward">
<summary> <summary>
科室单项奖励 科室单项奖励(只读)
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.ag_othersource.DistPerformance"> <member name="P:Performance.EntityModels.ag_othersource.DistPerformance">
...@@ -837,6 +837,21 @@ ...@@ -837,6 +837,21 @@
预留金额 预留金额
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.ag_othersource.ManagementAllowance">
<summary>
管理津贴
</summary>
</member>
<member name="P:Performance.EntityModels.ag_othersource.IndividualReward">
<summary>
单项奖励
</summary>
</member>
<member name="P:Performance.EntityModels.ag_othersource.AllocationOfKeySpecialty">
<summary>
重点专科分配
</summary>
</member>
<member name="T:Performance.EntityModels.ag_secondallot"> <member name="T:Performance.EntityModels.ag_secondallot">
<summary> <summary>
二次绩效列表 二次绩效列表
...@@ -2967,6 +2982,11 @@ ...@@ -2967,6 +2982,11 @@
调节后其他绩效 调节后其他绩效
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.im_employee_logistics.NeedSecondAllot">
<summary>
是否需要二次分配
</summary>
</member>
<member name="T:Performance.EntityModels.im_header"> <member name="T:Performance.EntityModels.im_header">
<summary> <summary>
...@@ -5072,6 +5092,11 @@ ...@@ -5072,6 +5092,11 @@
考核后绩效 考核后绩效
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.res_account.NeedSecondAllot">
<summary>
是否需要二次分配
</summary>
</member>
<member name="T:Performance.EntityModels.res_accountdoctor"> <member name="T:Performance.EntityModels.res_accountdoctor">
<summary> <summary>
医生科室核算结果 医生科室核算结果
...@@ -5562,6 +5587,11 @@ ...@@ -5562,6 +5587,11 @@
调节后其他绩效 调节后其他绩效
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.res_compute.NeedSecondAllot">
<summary>
是否需要二次分配 是 否
</summary>
</member>
<member name="T:Performance.EntityModels.res_reserved"> <member name="T:Performance.EntityModels.res_reserved">
<summary> <summary>
...@@ -5972,11 +6002,6 @@ ...@@ -5972,11 +6002,6 @@
是否显示二次绩效科主任1 启用 2 禁用 是否显示二次绩效科主任1 启用 2 禁用
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.sys_hospital.IsOpenLogisticsSecondAllot">
<summary>
是否开启行政后勤二次绩效分配 1 启用 2 禁用
</summary>
</member>
<member name="P:Performance.EntityModels.sys_hospital.IsSingleProject"> <member name="P:Performance.EntityModels.sys_hospital.IsSingleProject">
<summary> <summary>
抽取项目是否在同一环境 1 是 2 否 抽取项目是否在同一环境 1 是 2 否
...@@ -6292,6 +6317,11 @@ ...@@ -6292,6 +6317,11 @@
删除状态 1可用 2删除 删除状态 1可用 2删除
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.sys_user.ParentID">
<summary>
父级ID
</summary>
</member>
<member name="T:Performance.EntityModels.sys_user_hospital"> <member name="T:Performance.EntityModels.sys_user_hospital">
<summary> <summary>
...@@ -6332,5 +6362,55 @@ ...@@ -6332,5 +6362,55 @@
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.HisData.HisDepartment">
<summary>
His科室
</summary>
</member>
<member name="P:Performance.EntityModels.HisData.Department">
<summary>
科室
</summary>
</member>
<member name="P:Performance.EntityModels.HisData.AccountingUnit">
<summary>
核算单元
</summary>
</member>
<member name="P:Performance.EntityModels.HisData.DoctorName">
<summary>
医生姓名
</summary>
</member>
<member name="P:Performance.EntityModels.HisData.PersonnelName">
<summary>
医生姓名
</summary>
</member>
<member name="P:Performance.EntityModels.HisData.PersonnelNumber">
<summary>
人员工号
</summary>
</member>
<member name="P:Performance.EntityModels.HisData.Category">
<summary>
类别
</summary>
</member>
<member name="P:Performance.EntityModels.HisData.ItemName">
<summary>
类别
</summary>
</member>
<member name="P:Performance.EntityModels.HisData.Original">
<summary>
原始分类
</summary>
</member>
<member name="P:Performance.EntityModels.HisData.Value">
<summary>
费用
</summary>
</member>
</members> </members>
</doc> </doc>
performance/Performance.Services/ReportGlobalService.cs
...@@ -166,6 +166,7 @@ public void ImportAllotData(int hospitalId, string filePath) ...@@ -166,6 +166,7 @@ public void ImportAllotData(int hospitalId, string filePath)
for (int sheetIndex = 0; sheetIndex < workbook.NumberOfSheets; sheetIndex++) for (int sheetIndex = 0; sheetIndex < workbook.NumberOfSheets; sheetIndex++)
{ {
var sheet = workbook.GetSheetAt(sheetIndex); var sheet = workbook.GetSheetAt(sheetIndex);
logger.LogInformation($"大屏数据导入: {sheet.SheetName}");
if (sheet == null) continue; if (sheet == null) continue;
...@@ -175,6 +176,7 @@ public void ImportAllotData(int hospitalId, string filePath) ...@@ -175,6 +176,7 @@ public void ImportAllotData(int hospitalId, string filePath)
if (columns == null || !columns.Any(t => !string.IsNullOrEmpty(t.NoBlank()))) continue; if (columns == null || !columns.Any(t => !string.IsNullOrEmpty(t.NoBlank()))) continue;
var data = new List<his_importdata>(); var data = new List<his_importdata>();
logger.LogInformation($"sheet{sheet.SheetName}共{sheet.LastRowNum}行数据");
for (int rowIndex = 1; rowIndex < sheet.LastRowNum + 1; rowIndex++) for (int rowIndex = 1; rowIndex < sheet.LastRowNum + 1; rowIndex++)
{ {
var row = sheet.GetRow(rowIndex); var row = sheet.GetRow(rowIndex);
...@@ -193,7 +195,8 @@ public void ImportAllotData(int hospitalId, string filePath) ...@@ -193,7 +195,8 @@ public void ImportAllotData(int hospitalId, string filePath)
}; };
data.Add(importdata); data.Add(importdata);
} }
if (data == null || !data.Any(t => t.Year != 0 && t.Month != 0)) return; logger.LogInformation($"sheet{sheet.SheetName}共获取{data?.Count ?? 0}行数据");
if (data == null || !data.Any(t => t.Year != 0 && t.Month != 0)) continue;
data.ForEach(t => data.ForEach(t =>
{ {
...@@ -206,7 +209,9 @@ public void ImportAllotData(int hospitalId, string filePath) ...@@ -206,7 +209,9 @@ public void ImportAllotData(int hospitalId, string filePath)
var years = data.Select(t => t.Year).Distinct(); var years = data.Select(t => t.Year).Distinct();
var months = data.Select(t => t.Month).Distinct(); var months = data.Select(t => t.Month).Distinct();
logger.LogInformation($"开始删除数据");
hisimportdataRepository.DeleteFromQuery(t => t.HospitalId == hospitalId && years.Contains(t.Year) && months.Contains(t.Month) && t.Category == sheetName); hisimportdataRepository.DeleteFromQuery(t => t.HospitalId == hospitalId && years.Contains(t.Year) && months.Contains(t.Month) && t.Category == sheetName);
logger.LogInformation($"开始添加数据");
hisimportdataRepository.BulkInsert(data.Where(t => t.Year != 0 && t.Month != 0)); hisimportdataRepository.BulkInsert(data.Where(t => t.Year != 0 && t.Month != 0));
} }
} }
......
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