Skip to content

P
performance
Commit ce4a551e by lcx
Options

Merge tag '显式管理绩效按钮' into develop 

# Conflicts:
#	performance/Performance.Services/SecondAllot/SecondAllotDetails.cs
parents 54ca9ffb 378f2bec
Showing with 62 additions and 7 deletions
performance/Performance.Api/appsettings.Localhost.json
......@@ -8,7 +8,7 @@
},
"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=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;",
"PerformanceConnectionString": "server=192.168.18.166;database=db_test_wujiang;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;",
"RedisConnectionString": "116.62.245.55:6379,defaultDatabase=2"
},
......
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
......@@ -2226,6 +2226,11 @@
是否开启科室CMI占比 1 启用 2 禁用
</summary>
</member>
<member name="P:Performance.DtoModels.HospitalRequest.IsShowManageButton">
<summary>
行政后勤是否显示管理绩效按钮 1 是 2 否
</summary>
</member>
<member name="P:Performance.DtoModels.IncomeRequest.SheetNameKeyword">
<summary>
关键字匹配
......@@ -3239,6 +3244,11 @@
是否开启行政后勤二次绩效分配 1 启用 2 禁用
</summary>
</member>
<member name="P:Performance.DtoModels.HospitalResponse.IsShowManageButton">
<summary>
行政后勤是否显示管理绩效按钮 1 是 2 否
</summary>
</member>
<member name="P:Performance.DtoModels.IncomeResponse.SheetNameKeyword">
<summary>
关键字匹配
......@@ -3534,6 +3544,11 @@
0 不显示 1 显示
</summary>
</member>
<member name="P:Performance.DtoModels.SecondListResponse.IsShowManageButton">
<summary>
行政后勤是否显示管理绩效按钮 1 是 2 否
</summary>
</member>
<member name="P:Performance.DtoModels.SecondPerforResponse.Efficiency">
<summary>
效率绩效
......
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
......@@ -6926,6 +6926,11 @@
抽取项目是否在同一环境 1 是 2 否
</summary>
</member>
<member name="P:Performance.EntityModels.sys_hospital.IsShowManageButton">
<summary>
行政后勤是否显示管理绩效按钮 1 是 2 否
</summary>
</member>
<member name="T:Performance.EntityModels.sys_hospitalconfig">
<summary>
......@@ -7351,5 +7356,15 @@
核算单元
</summary>
</member>
<member name="P:Performance.EntityModels.view_per_total_amount.Amount">
<summary>
医院其他绩效
</summary>
</member>
<member name="P:Performance.EntityModels.view_per_total_amount.Use">
<summary>
是否被使用 默认false
</summary>
</member>
</members>
</doc>
performance/Performance.DtoModels/Request/HospitalRequest.cs
......@@ -64,6 +64,11 @@ public class HospitalRequest
///// 是否开启行政后勤二次绩效分配 1 启用 2 禁用
///// </summary>
//public Nullable<int> IsOpenLogisticsSecondAllot { get; set; }
/// <summary>
/// 行政后勤是否显示管理绩效按钮 1 是 2 否
/// </summary>
public Nullable<int> IsShowManageButton { get; set; }
}
public class HospitalRequestValidator : AbstractValidator<HospitalRequest>
......
performance/Performance.DtoModels/Response/HospitalRequest.cs
......@@ -32,5 +32,10 @@ public class HospitalResponse
/// 是否开启行政后勤二次绩效分配 1 启用 2 禁用
/// </summary>
public Nullable<int> IsOpenLogisticsSecondAllot { get; set; }
/// <summary>
/// 行政后勤是否显示管理绩效按钮 1 是 2 否
/// </summary>
public Nullable<int> IsShowManageButton { get; set; }
}
}
performance/Performance.DtoModels/Response/SecondListResponse.cs
......@@ -21,5 +21,10 @@ public class SecondListResponse : ag_secondallot
/// 0 不显示 1 显示
/// </summary>
public int ShowFormula { get; set; }
/// <summary>
/// 行政后勤是否显示管理绩效按钮 1 是 2 否
/// </summary>
public Nullable<int> IsShowManageButton { get; set; }
}
}
\ No newline at end of file
performance/Performance.EntityModels/Entity/sys_hospital.cs
......@@ -115,5 +115,10 @@ public class sys_hospital
/// 抽取项目是否在同一环境 1 是 2 否
/// </summary>
public Nullable<int> IsSingleProject { get; set; }
/// <summary>
/// 行政后勤是否显示管理绩效按钮 1 是 2 否
/// </summary>
public Nullable<int> IsShowManageButton { get; set; }
}
}
performance/Performance.Services/HospitalService.cs
......@@ -107,6 +107,7 @@ public HospitalResponse Insert(HospitalRequest request, int userid)
hospital.CreateDate = DateTime.Now;
hospital.CreateUser = userid;
hospital.States = (int)States.Enabled;
hospital.IsShowManageButton = (int)States.Disabled;
if (!_hospitalRepository.Add(hospital))
throw new PerformanceException("保存失败");
......@@ -136,6 +137,7 @@ public HospitalResponse Update(HospitalRequest request)
//hospital.IsOpenCMIPercent = request.IsOpenCMIPercent;
//hospital.IsOpenLogisticsSecondAllot = request.IsOpenLogisticsSecondAllot;
//hospital.IsOpenIncome = request.IsOpenIncome;
hospital.IsShowManageButton = request.IsShowManageButton;
if (!_hospitalRepository.Update(hospital))
throw new PerformanceException("保存失败");
......
performance/Performance.Services/SecondAllot/SecondAllotDetails.cs
......@@ -824,7 +824,7 @@ private void SupplementSecondDetail(ag_secondallot second, List<per_employee> em
}
// 必须是相同核算单元类型才能带出医院其他绩效
if (second.UnitType.Replace("其他", "").Replace("医技", "医生")
== empl?.UnitType.Replace("其他", "").Replace("医技", "医生"))
== (empl?.UnitType ?? "").Replace("其他", "").Replace("医技", "医生"))
{
if (second.UnitType == UnitType.行政后勤.ToString())
{
......
performance/Performance.Services/SecondAllotService.cs
......@@ -130,10 +130,10 @@ public List<SecondListResponse> GetSecondList(int userId)
throw new NotImplementedException("人员ID无效");
var userrole = userroleRepository.GetEntity(t => t.UserID == userId);
var role = roleRepository.GetEntity(t => t.ID == userrole.RoleID);
var hospital = userhospitalRepository.GetEntity(t => t.UserID == userId);
if (hospital == null)
var userhospital = userhospitalRepository.GetEntity(t => t.UserID == userId);
if (userhospital == null)
throw new NotImplementedException("人员未选择医院");
var allotList = perallotRepository.GetEntities(t => t.HospitalId == hospital.HospitalID && new List<int> { 6, 8, 10 }.Contains(t.States));
var allotList = perallotRepository.GetEntities(t => t.HospitalId == userhospital.HospitalID && new List<int> { 6, 8, 10 }.Contains(t.States));
if (allotList == null || allotList.Count == 0)
return new List<SecondListResponse>();
......@@ -150,6 +150,7 @@ public List<SecondListResponse> GetSecondList(int userId)
var secondList = agsecondallotRepository.GetEntities(exp);
var list = Mapper.Map<List<SecondListResponse>>(secondList);
var hospital = hospitalRepository.GetEntity(t => t.ID == userhospital.HospitalID);
list?.ForEach(t =>
{
var allot = allotList.FirstOrDefault(a => a.ID == t.AllotId);
......@@ -159,19 +160,20 @@ public List<SecondListResponse> GetSecondList(int userId)
t.States = allot.States;
t.ShowFormula = allot.ShowFormula;
}
t.IsShowManageButton = hospital?.IsShowManageButton ?? (int)States.Disabled;
});
if (secondList != null && secondList.Any())
{
// 暂时在加载列表时补充信息
var worktypes = agworkloadtypeRepository.GetEntities(t => t.HospitalId == hospital.HospitalID && t.Department == secondList.First().Department && t.UnitType == secondList.First().UnitType);
var worktypes = agworkloadtypeRepository.GetEntities(t => t.HospitalId == userhospital.HospitalID && t.Department == secondList.First().Department && t.UnitType == secondList.First().UnitType);
if (worktypes != null && worktypes.Any())
{
worktypes.ForEach(t => AddWorkTypeDefaultValues(t));
}
// 补充默认工作量项
CheckDefaultWorkload(hospital.HospitalID ?? 0, secondList.First().Department, secondList.First().UnitType);
CheckDefaultWorkload(userhospital.HospitalID ?? 0, secondList.First().Department, secondList.First().UnitType);
}
return list;
......
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