核算单元数据类型修改，核算单元类型字典

performance/Performance.Api/Controllers/GuaranteeController.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Performance.DtoModels;
 using Performance.EntityModels;
+using Performance.Infrastructure;
 using Performance.Services;
 using System;
 using System.Collections.Generic;
@@ -89,5 +90,18 @@ public ApiResponse<List<TitleValue>> Accounting([CustomizeValidator(RuleSet = "S
             return new ApiResponse<List<TitleValue>>(ResponseType.OK, "医院核算单元列表", result);
         }
         #endregion
+
+
+        /// <summary>
+        /// 医院核算单元
+        /// </summary>
+        /// <returns></returns>
+        [Route("unittype")]
+        [HttpPost]
+        public ApiResponse<List<EnumItem>> UnitType()
+        {
+            var result = guaranteeService.UnitType();
+            return new ApiResponse<List<EnumItem>>(ResponseType.OK, "核算单元类型", result);
+        }
     }
 }

performance/Performance.DtoModels/Response/GuaranteeResponse.cs

@@ -19,7 +19,7 @@ public class GuaranteeResponse
         /// <summary>
         /// 核算单元类型 1 医生组 2 护理组 3 医技组
         /// </summary>
-        public string UnitType { get; set; }
+        public Nullable<int> UnitType { get; set; }
 
         /// <summary>
         /// 保底科室

performance/Performance.Services/GuaranteeService.cs

 using AutoMapper;
 using Performance.DtoModels;
 using Performance.EntityModels;
+using Performance.Infrastructure;
 using Performance.Repository;
 using System;
 using System.Collections.Generic;
@@ -55,7 +56,7 @@ public List<GuaranteeResponse> GuaranTree(int allotId)
                         Target = g.Key.Target,
                         Source = g.Select(t => new GuaranItems { GId = t.Id, GValue = t.Source }).ToList(),
                         Priority = g.Min(m => m.Priority.Value),
-                        UnitType = ((UnitType)g.Key.UnitType.Value).ToString()
+                        UnitType = g.Key.UnitType
                     }).OrderBy(t => t.UnitType).ThenBy(t => t.Priority).ToList();
                 return group;
             }
@@ -154,16 +155,16 @@ public List<TitleValue> Accounting(int allotId)
             }
             return result;
         }
+        #endregion
 
         /// <summary>
-        /// 获取优先级
+        /// 医院核算单元
         /// </summary>
         /// <param name="allotId"></param>
         /// <returns></returns>
-        public int Priority(int allotId, int unitType, string target)
+        public List<EnumItem> UnitType()
         {
-            return perforCofguaranteeRepository.GetEntity(t => t.AllotId == allotId && t.UnitType == unitType && t.Target == target)?.Priority ?? 0;
+            return EnumHelper.GetItems<UnitType>();
         }
-        #endregion
     }
 }