Commit 246fb67e by wyc

特殊核算组 医院奖罚

parent 4c9a4cd0
...@@ -364,6 +364,7 @@ public int SaveAccountBasic(PerSheet sheet, per_allot allot, List<per_sheet> she ...@@ -364,6 +364,7 @@ public int SaveAccountBasic(PerSheet sheet, per_allot allot, List<per_sheet> she
var imdata = _mapper.Map<im_accountbasic>(data); var imdata = _mapper.Map<im_accountbasic>(data);
imdata.SheetID = imsheet.ID; imdata.SheetID = imsheet.ID;
imdata.AllotID = allot.ID; imdata.AllotID = allot.ID;
imdata.DoctorExtra = data.Extra;
addList.Add(imdata); addList.Add(imdata);
} }
connection.Insert(addList.ToArray()); connection.Insert(addList.ToArray());
......
...@@ -136,6 +136,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s ...@@ -136,6 +136,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
else if (UnitTypeUtil.Is(response.UnitType, UnitType.特殊核算组.ToString())) else if (UnitTypeUtil.Is(response.UnitType, UnitType.特殊核算组.ToString()))
{ {
var special = _perforResspecialunitRepository.GetEntities(t => t.AllotID == allotId && t.Department == accountingUnit); var special = _perforResspecialunitRepository.GetEntities(t => t.AllotID == allotId && t.Department == accountingUnit);
var imAccountbasics = _perforImaccountbasicRepository.GetEntities(t => t.AllotID == allotId && t.DoctorAccountingUnit == accountingUnit);
if (special?.Any() != true) return response; if (special?.Any() != true) return response;
account.AdjustLaterOtherFee = special.FirstOrDefault()?.AdjustLaterOtherFee ?? 0; account.AdjustLaterOtherFee = special.FirstOrDefault()?.AdjustLaterOtherFee ?? 0;
account.AssessLaterOtherFee = special.FirstOrDefault()?.AssessLaterOtherFee ?? 0; account.AssessLaterOtherFee = special.FirstOrDefault()?.AssessLaterOtherFee ?? 0;
...@@ -143,6 +144,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s ...@@ -143,6 +144,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
account.MedicineExtra = special.FirstOrDefault()?.MedicineExtra ?? 0; account.MedicineExtra = special.FirstOrDefault()?.MedicineExtra ?? 0;
account.MaterialsExtra = special.FirstOrDefault()?.MaterialsExtra ?? 0; account.MaterialsExtra = special.FirstOrDefault()?.MaterialsExtra ?? 0;
account.ScoringAverage = special.FirstOrDefault()?.ScoringAverage ?? 0; account.ScoringAverage = special.FirstOrDefault()?.ScoringAverage ?? 0;
account.Extra = imAccountbasics.FirstOrDefault()?.DoctorExtra ?? 0;
var detailItems = new DeptDetailItem(); var detailItems = new DeptDetailItem();
#region 补全特殊核算组量化指标明细 #region 补全特殊核算组量化指标明细
......
...@@ -44,6 +44,7 @@ public partial class ComputeService : IAutoInjection ...@@ -44,6 +44,7 @@ public partial class ComputeService : IAutoInjection
private readonly PerforCofEmpDetailRepository _perforCofEmpDetailRepository; private readonly PerforCofEmpDetailRepository _perforCofEmpDetailRepository;
private readonly PerforAgsecondallotRepository _agsecondallotRepository; private readonly PerforAgsecondallotRepository _agsecondallotRepository;
private readonly PerforRescomputeRepository _rescomputeRepository; private readonly PerforRescomputeRepository _rescomputeRepository;
private readonly PerforImaccountbasicRepository _perforImaccountbasicRepository;
public ComputeService( public ComputeService(
IMapper mapper, IMapper mapper,
...@@ -73,7 +74,8 @@ public partial class ComputeService : IAutoInjection ...@@ -73,7 +74,8 @@ public partial class ComputeService : IAutoInjection
PerforCofDeptDetailRepository perforCofDeptDetailRepository, PerforCofDeptDetailRepository perforCofDeptDetailRepository,
PerforCofEmpDetailRepository perforCofEmpDetailRepository, PerforCofEmpDetailRepository perforCofEmpDetailRepository,
PerforAgsecondallotRepository agsecondallotRepository, PerforAgsecondallotRepository agsecondallotRepository,
PerforRescomputeRepository rescomputeRepository PerforRescomputeRepository rescomputeRepository,
PerforImaccountbasicRepository perforImaccountbasicRepository
) )
{ {
_mapper = mapper; _mapper = mapper;
...@@ -104,6 +106,7 @@ PerforRescomputeRepository rescomputeRepository ...@@ -104,6 +106,7 @@ PerforRescomputeRepository rescomputeRepository
_perforCofEmpDetailRepository = perforCofEmpDetailRepository; _perforCofEmpDetailRepository = perforCofEmpDetailRepository;
_agsecondallotRepository = agsecondallotRepository; _agsecondallotRepository = agsecondallotRepository;
_rescomputeRepository = rescomputeRepository; _rescomputeRepository = rescomputeRepository;
_perforImaccountbasicRepository = perforImaccountbasicRepository;
} }
public int IsShowManage(int allotId) public int IsShowManage(int allotId)
......
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