新增百分比格式化

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

@@ -1047,14 +1047,14 @@
         </member>
         <member name="M:Performance.Api.Controllers.ComputeController.GetUniteDeptDetailSetting(System.Int32)">
             <summary>
-            科室绩效详情显示隐藏设置
+            科室绩效详情显示隐藏设置--加载
             </summary>
             <param name="allotId"></param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.ComputeController.SaveUniteDeptDetailSetting(System.Int32,Performance.DtoModels.UniteDeptSetting)">
             <summary>
-            科室绩效详情显示隐藏设置
+            科室绩效详情显示隐藏设置--保存
             </summary>
             <param name="allotId"></param>
             <param name="request"></param>

performance/Performance.DtoModels/Enum.cs

@@ -229,7 +229,11 @@ public enum Format
             两位小数,
             三位小数,
             四位小数,
-            百分比,
+            整数百分比,
+            一位小数百分比,
+            两位小数百分比,
+            三位小数百分比,
+            四位小数百分比,
         }
     }
 }

performance/Performance.Services/ComputeService.UniteDeptDetail.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using Masuit.Tools;
+using NPOI.Util;
 using Performance.DtoModels;
 using Performance.EntityModels;
 using Performance.Infrastructure;
@@ -64,7 +65,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
                             { "工号", item.JobNumber },
                             { "姓名", item.EmployeeName },
                             { "系数", ValueFormating(item.PostCoefficient,"") },
-                            { "出勤", ValueFormating(item.Attendance, UniteDept.Format.百分比.ToString()) },
+                            { "出勤", ValueFormating(item.Attendance, UniteDept.Format.两位小数百分比.ToString()) },
                             { "其他绩效", ValueFormating(item.OtherPerfor,"") },
                             { "绩效合计",  ValueFormating(item.PerforTotal,UniteDept.Format.两位小数.ToString()) },
                         });
@@ -170,7 +171,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
                                 {
                                     { "量化指标", post.Key.TypeName },
                                     { "量化分值", ValueFormating(lhfz, "") },
-                                    { "核算比例", ValueFormating(post.FirstOrDefault().FactorValue, UniteDept.Format.百分比.ToString()) },
+                                    { "核算比例", ValueFormating(post.FirstOrDefault().FactorValue, UniteDept.Format.两位小数百分比.ToString()) },
                                     { "核算分值", ValueFormating(hsfz, "") },
                                 };
                                 items.Add(row);
@@ -353,9 +354,25 @@ private string ValueFormating(decimal? value, string format)
             }
             else
             {
-                if (format == UniteDept.Format.百分比.ToString())
+                if (format == UniteDept.Format.整数百分比.ToString())
                 {
-                    return string.Format("{0:P}", total);
+                    return string.Format("{0:P0}", total);
+                }
+                else if (format == UniteDept.Format.一位小数百分比.ToString())
+                {
+                    return string.Format("{0:P1}", total);
+                }
+                else if (format == UniteDept.Format.两位小数百分比.ToString())
+                {
+                    return string.Format("{0:P2}", total);
+                }
+                else if (format == UniteDept.Format.三位小数百分比.ToString())
+                {
+                    return string.Format("{0:P3}", total);
+                }
+                else if (format == UniteDept.Format.四位小数百分比.ToString())
+                {
+                    return string.Format("{0:P4}", total);
                 }
                 else if (Math.Abs(total) < 1.5m)
                 {
@@ -426,7 +443,7 @@ public UniteDeptSetting GetUniteDeptDetailSetting(int allotId)
             // 只显示合计没有详情
             response.DetailItems.Add(new UniteDeptDetailItem { Title = UniteDept.Title.考核后绩效.ToString(), Type = (int)UniteDept.Type.右侧收缩, Format = UniteDept.Format.整数.ToString(), Remark = "考核前绩效 × 考核得分率 + 药占比奖罚 + 材料占比奖罚 + 医院奖罚 + 考核后其他绩效" });
             response.DetailItems.Add(new UniteDeptDetailItem { Title = UniteDept.Title.考核后其他绩效.ToString(), Type = (int)UniteDept.Type.右侧收缩, Format = UniteDept.Format.整数.ToString(), });
-            response.DetailItems.Add(new UniteDeptDetailItem { Title = UniteDept.Title.调节系数.ToString(), Type = (int)UniteDept.Type.右侧收缩, Format = UniteDept.Format.百分比.ToString(), });
+            response.DetailItems.Add(new UniteDeptDetailItem { Title = UniteDept.Title.调节系数.ToString(), Type = (int)UniteDept.Type.右侧收缩, Format = UniteDept.Format.两位小数百分比.ToString(), });
             response.DetailItems.Add(new UniteDeptDetailItem { Title = UniteDept.Title.实发绩效.ToString(), Type = (int)UniteDept.Type.右侧收缩, Format = UniteDept.Format.整数.ToString(), Remark = "考核后绩效 × 调节系数 + 调节后其他绩效" });
 
             // 显示详情 
@@ -434,12 +451,12 @@ public UniteDeptSetting GetUniteDeptDetailSetting(int allotId)
             {
                 var rightSheetTypeMaps = new List<UniteDeptDetailItem>()
                 {
-                    new UniteDeptDetailItem { Title = UniteDept.Title.预算比例.ToString(), SheetType = (int)SheetType.BudgetRatio, Format = UniteDept.Format.百分比.ToString(), },
+                    new UniteDeptDetailItem { Title = UniteDept.Title.预算比例.ToString(), SheetType = (int)SheetType.BudgetRatio, Format = UniteDept.Format.两位小数百分比.ToString(), },
                     new UniteDeptDetailItem { Title = UniteDept.Title.医院奖罚.ToString(), SheetType = (int)SheetType.AccountExtra, Format = UniteDept.Format.整数.ToString(), },
                     new UniteDeptDetailItem { Title = UniteDept.Title.考核前其他绩效.ToString(), SheetType = (int)SheetType.AssessBeforeOtherFee, Format = UniteDept.Format.整数.ToString(), },
                     new UniteDeptDetailItem { Title = UniteDept.Title.药占比奖罚.ToString(), SheetType = (int)SheetType.AccountDrugAssess, Format = UniteDept.Format.整数.ToString(), },
                     new UniteDeptDetailItem { Title = UniteDept.Title.材料占比奖罚.ToString(), SheetType = (int)SheetType.AccountMaterialsAssess, Format = UniteDept.Format.整数.ToString(), },
-                    new UniteDeptDetailItem { Title = UniteDept.Title.考核得分率.ToString(), SheetType = (int)SheetType.AccountScoreAverage, Format = UniteDept.Format.百分比.ToString(), },
+                    new UniteDeptDetailItem { Title = UniteDept.Title.考核得分率.ToString(), SheetType = (int)SheetType.AccountScoreAverage, Format = UniteDept.Format.两位小数百分比.ToString(), },
                     new UniteDeptDetailItem { Title = UniteDept.Title.调节后其他绩效.ToString(), SheetType = (int)SheetType.AccountAdjustLaterOtherFee, Format = UniteDept.Format.整数.ToString(), },
                 };
                 foreach (var detail in rightSheetTypeMaps)