预算比例值保存位置调整、科主任/护士长管理绩效修改详情

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -446,7 +446,9 @@ public ApiResponse SecondPrint(int secondid)
         public ApiResponse DeptComputeDetail(int allotId)
         {
             var userId = claimService.GetUserId();
-            var data = secondAllotService.DeptComputeDetail(userId, allotId, out int isShowManage);
+            //var data = secondAllotService.DeptComputeDetail(userId, allotId, out int isShowManage);
+            var data = secondAllotService.DeptComputeDetailList(userId, allotId, out int isShowManage);
+            
             return new ApiResponse(ResponseType.OK, new { isShowManage, data });
         }
     }

performance/Performance.Services/BudgetService.cs

@@ -78,8 +78,13 @@ public bool SaveBudgetData(int mainYear, List<BudgetResponse> request, int userI
             if (amounts != null && perbudgetamountRepository.AddRange(amounts.ToArray()))
             {
                 var ratios = Mapper.Map<List<per_budget_ratio>>(request.Where(t => t.Type == 2));
+                var budgetData = request.FirstOrDefault(t => t.Type == 2);
                 ratios.ForEach(t =>
                 {
+                    t.HospitalRevenue = budgetData?.HospitalRevenue;
+                    t.MeritPayIncrement = budgetData?.MeritPayIncrement;
+                    t.TheDrugIncomeBudget = budgetData?.TheDrugIncomeBudget;
+                    t.MaterialIncomeBudget = budgetData?.MaterialIncomeBudget;
                     t.MainYear = mainYear;
                     t.CreateTime = DateTime.Now;
                     t.CreateUser = userId;
@@ -136,19 +141,20 @@ public bool ModifyBudgetData(List<BudgetResponse> request)
                 foreach (var item in ratios)
                 {
                     var data = request.FirstOrDefault(t => t.Type == 2 && t.Id == item.Id);
+                    var budgetData = request.FirstOrDefault(t => t.Type == 2);
                     if (data == null) continue;
-                    item.HospitalRevenue = data.HospitalRevenue;
+                    item.HospitalRevenue = data.HospitalRevenue == 0 ? budgetData?.HospitalRevenue:data.HospitalRevenue;
                     item.TotalLaborCost = data.TotalLaborCost;
                     item.StaffSpendingFixed = data.StaffSpendingFixed;
                     item.StaffSpendingBonus = data.StaffSpendingBonus;
-                    item.MeritPayIncrement = data.MeritPayIncrement;
+                    item.MeritPayIncrement = data.MeritPayIncrement==0?budgetData?.MeritPayIncrement:data.MeritPayIncrement;
                     item.TotalMeritPay = data.TotalMeritPay;
                     item.Amplification = data.Amplification;
                     item.IncrementCapitaRatio = data.IncrementCapitaRatio;
                     item.TheDrugIncome = data.TheDrugIncome;
-                    item.TheDrugIncomeBudget = data.TheDrugIncomeBudget;
+                    item.TheDrugIncomeBudget = data.TheDrugIncomeBudget==0?budgetData?.TheDrugIncomeBudget:data.TheDrugIncomeBudget;
                     item.MaterialIncome = data.MaterialIncome;
-                    item.MaterialIncomeBudget = data.MaterialIncomeBudget;
+                    item.MaterialIncomeBudget = data.MaterialIncomeBudget==0?budgetData?.MaterialIncomeBudget:data.MaterialIncomeBudget;
                     item.TheCostInTotal = data.TheCostInTotal;
                     item.DepreOfFixedAssets = data.DepreOfFixedAssets;
                     item.AmortOfIntangibleAssets = data.AmortOfIntangibleAssets;

performance/Performance.Services/SecondAllotService.cs

@@ -1796,6 +1796,37 @@ public List<SecondPerforResponse> DeptComputeDetail(int userId, int allotId, out
             return result;
         }
 
+        public List<DeptDataDetails> DeptComputeDetailList(int userId, int allotId, out int isShowManage)
+        {
+            var user = perforUserRepository.GetEntity(t => t.ID == userId);
+            if (user == null)
+                throw new NotImplementedException("人员ID无效");
+
+            var deptDatas = new List<DeptDataDetails>();
+            var allot = perforPerallotRepository.GetEntity(t => t.ID == allotId);
+            isShowManage = computeService.IsShowManage(allotId);
+
+            var userrole = userroleRepository.GetEntity(t => t.UserID == userId);
+            var role = roleRepository.GetEntity(t => t.ID == userrole.RoleID);
+            Dictionary<int, string> dict = new Dictionary<int, string>
+            {
+                { application.DirectorRole, AccountUnitType.科主任.ToString() },
+                { application.NurseRole, AccountUnitType.护士长.ToString() },
+                { application.OfficeRole, AccountUnitType.行政中层.ToString() },
+                { application.SpecialRole, AccountUnitType.科主任.ToString() },
+            };
+
+            if (!dict.Keys.Contains(role.Type.Value)) return new List<DeptDataDetails>();
+
+            var computes = rescomputeRepository.GetEntities(t => t.AllotID == allotId && t.AccountingUnit == user.Department && t.AccountType == dict[role.Type.Value]);
+            if (computes == null || !computes.Any()) return new List<DeptDataDetails>();
+            foreach (var item in computes)
+            {
+                deptDatas.Add(computeService.GetDoctorDetail(item.ID));
+            }
+            return deptDatas;
+        }
+
         /// <summary>
         /// 获取一次次绩效结果
         /// </summary>