Merge branch 'feature/医院其他绩效大改' into develop

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

@@ -7341,5 +7341,15 @@
             核算单元
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.view_per_total_amount.UnitType">
+            <summary>
+            核算单元组别
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.view_per_total_amount.AccountingUnit">
+            <summary>
+            核算单元
+            </summary>
+        </member>
     </members>
 </doc>

performance/Performance.EntityModels/Other/view_per_apr_amount.cs

@@ -11,4 +11,24 @@ public class view_per_apr_amount : per_apr_amount
         /// </summary>
         public string AccountingUnit { get; set; }
     }
+    public class view_per_total_amount
+    {
+        /// <summary>
+        /// 核算单元组别
+        /// </summary>
+        public string UnitType { get; set; }
+        /// <summary>
+        /// 核算单元
+        /// </summary>
+        public string AccountingUnit { get; set; }
+        public string PersonnelNumber { get; set; }
+        /// <summary>
+        /// 医院其他绩效
+        /// </summary>
+        public decimal Amount { get; set; }
+        /// <summary>
+        /// 是否被使用 默认false
+        /// </summary>
+        public bool Use { get; set; }
+    }
 }

performance/Performance.Services/EmployeeService.cs

@@ -744,11 +744,11 @@ public List<TitleValue> GetPerforTypeDict(int allotId)
                 foreach (var type in perForType)
                 {
                     var emp = aprAmountList.Where(t => t.PerforType == type && t.PersonnelNumber == num);
-                    dicData.Add(type, Math.Round(emp?.Sum(c => c.Amount) ?? 0).ToString());
+                    dicData.Add(type, Math.Round(emp?.Sum(c => c.Amount) ?? 0, 2).ToString());
                 }
 
                 var sum = aprAmountList.Where(c => c.PersonnelNumber == num)?.Sum(t => t.Amount);
-                dicData.Add("合计", Math.Round(sum ?? 0, 0).ToString());
+                dicData.Add("合计", Math.Round(sum ?? 0, 2).ToString());
                 others.Add(dicData);
             }