Merge branch 'feature/108问题修复' into develop

performance/Performance.Api/Controllers/ComputeController.cs

@@ -305,6 +305,7 @@ public ApiResponse AllComputeByPM([FromBody] ComputerRequest request)
                 AdjustLaterOtherFee = t.Sum(s => s.AdjustLaterOtherFee),
                 ShouldGiveFee = t.Sum(s => s.ShouldGiveFee),
                 OthePerfor = t.Sum(s => s.OthePerfor),
+                HideOtherPerfor = t.Sum(s => s.HideOtherPerfor),
                 NightWorkPerfor = t.Sum(s => s.NightWorkPerfor),
                 RealGiveFee = t.Sum(s => s.RealGiveFee),
                 ReservedRatio = t.Sum(s => s.ReservedRatio),

performance/Performance.Api/wwwroot/Performance.DtoModels.xml

@@ -2900,6 +2900,11 @@
             医院其他绩效
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ComputeResponse.HideOtherPerfor">
+            <summary>
+            不公示其他绩效
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.ComputeResponse.NightWorkPerfor">
             <summary>
             夜班费
@@ -3186,7 +3191,12 @@
         </member>
         <member name="P:Performance.DtoModels.DeptResponse.AprPerforAmount">
             <summary>
-            其他绩效
+            医院其他绩效
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.DeptResponse.HideAprOtherPerforAmount">
+            <summary>
+            不公示其他绩效
             </summary>
         </member>
         <member name="P:Performance.DtoModels.DirectorResponse.TypeName">

performance/Performance.Api/wwwroot/Performance.EntityModels.xml

@@ -7444,6 +7444,11 @@
             核算单元
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.view_per_total_amount.PersonnelNumber">
+            <summary>
+            工号
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.view_per_total_amount.Amount">
             <summary>
             医院其他绩效

performance/Performance.DtoModels/Response/ComputeResponse.cs

@@ -65,6 +65,11 @@ public ComputeResponse(string source, string accountingUnit, string employeeName
         public Nullable<decimal> OthePerfor { get; set; }
 
         /// <summary>
+        /// 不公示其他绩效
+        /// </summary>
+        public Nullable<decimal> HideOtherPerfor { get; set; }
+
+        /// <summary>
         /// 夜班费
         /// </summary>
         public Nullable<decimal> NightWorkPerfor { get; set; }

performance/Performance.DtoModels/Response/DeptResponse.cs

@@ -174,8 +174,12 @@ public class DeptResponse
         public Nullable<decimal> AssessLaterManagementFee { get; set; }
 
         /// <summary>
-        /// 其他绩效
+        /// 医院其他绩效
         /// </summary>
         public Nullable<decimal> AprPerforAmount { get; set; }
+        /// <summary>
+        /// 不公示其他绩效
+        /// </summary>
+        public Nullable<decimal> HideAprOtherPerforAmount { get; set; }
     }
 }

performance/Performance.EntityModels/Other/view_per_apr_amount.cs

@@ -13,6 +13,17 @@ public class view_per_apr_amount : per_apr_amount
     }
     public class view_per_total_amount
     {
+        public view_per_total_amount() { }
+
+        public view_per_total_amount(string unitType, string accountingUnit, string personnelNumber, decimal amount, bool use = false)
+        {
+            UnitType = unitType;
+            AccountingUnit = accountingUnit;
+            PersonnelNumber = personnelNumber;
+            Amount = amount;
+            Use = use;
+        }
+
         /// <summary>
         /// 核算单元组别
         /// </summary>
@@ -21,6 +32,9 @@ public class view_per_total_amount
         /// 核算单元
         /// </summary>
         public string AccountingUnit { get; set; }
+        /// <summary>
+        /// 工号
+        /// </summary>
         public string PersonnelNumber { get; set; }
         /// <summary>
         /// 医院其他绩效

performance/Performance.Services/EmployeeService.cs

@@ -729,18 +729,8 @@ public view_per_apr_amount GetEmployeeMessage(int allotId, string personnelNumbe
         /// <returns></returns>
         public string GetTypeInDepartment(int userId)
         {
-            var userrole = userroleRepository.GetEntity(t => t.UserID == userId);
-            if (userrole == null) throw new PerformanceException("用户未绑定角色");
-
-            string typeIn = "";
-            // 护士长/科主任/特殊科室/行政科室 录入科室为核算单元
-            if (new int[] { 3, 4, 9, 10 }.Contains(userrole.RoleID))
-                typeIn = userRepository.GetEntity(w => w.ID == userId)?.Department ?? "";
-            // 非 护士长/科主任/特殊科室/行政科室 则为角色名称
-            else
-                typeIn = _roleRepository.GetEntity(w => w.ID == userrole.RoleID)?.RoleName ?? "";
-
-            return typeIn;
+            var user = userRepository.GetEntity(t => t.ID == userId);
+            return user?.Login ?? "";
         }
 
         #region 科室考核
@@ -928,7 +918,7 @@ public bool ConfirmAuditHide(int userid, AprAmountAuditRequest request)
                 }
             }
             return true;
-        } 
+        }
 
         /// <summary>
         /// 上传导入医院其他绩效