BUG修复

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

@@ -1765,6 +1765,11 @@
             是否显示绩效合计 1 显示绩效合计 2 显示管理绩效
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.HospitalRequest.IsOpenCMIPercent">
+            <summary>
+            是否开启科室CMI占比 1 启用 2 禁用
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.IncomeRequest.SheetNameKeyword">
             <summary>
             关键字匹配

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

@@ -2937,6 +2937,16 @@
             金额
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.per_apr_amount.TypeInDepartment">
+            <summary>
+            录入科室
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.per_apr_amount.AccountingUnit">
+            <summary>
+            核算单元
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.per_apr_amount.CreateDate">
             <summary>
             

performance/Performance.EntityModels/Entity/per_apr_amount.cs

@@ -45,7 +45,17 @@ public class per_apr_amount
         /// 金额
         /// </summary>
         public Nullable<decimal> Amount { get; set; }
-    
+
+        /// <summary>
+        /// 录入科室
+        /// </summary>
+        public string TypeInDepartment { get; set; }
+
+        /// <summary>
+        /// 核算单元
+        /// </summary>
+        public string AccountingUnit { get; set; }
+
         /// <summary>
         /// 
         /// </summary>

performance/Performance.Services/EmployeeService.cs

@@ -388,9 +388,9 @@ public bool InsertApr(per_apr_amount request, int userId)
             if (request == null)
                 return false;
 
-            var data = perapramountRepository.GetEntity(t => t.PersonnelNumber == request.PersonnelNumber && t.AllotId == request.AllotId);
-            if (data != null)
-                throw new PerformanceException("人员工号已存在");
+            //var data = perapramountRepository.GetEntity(t => t.PersonnelNumber == request.PersonnelNumber && t.AllotId == request.AllotId);
+            //if (data != null)
+            //    throw new PerformanceException("人员工号已存在");
 
             request.CreateDate = DateTime.Now;
             request.CreateUser = userId;
@@ -409,6 +409,8 @@ public bool UpdateApr(per_apr_amount request)
             data.PersonnelNumber = request.PersonnelNumber;
             data.DoctorName = request.DoctorName;
             data.PerforType = request.PerforType;
+            data.TypeInDepartment = request.TypeInDepartment;
+            data.AccountingUnit = request.AccountingUnit;
             data.Amount = request.Amount;
 
             return perapramountRepository.Update(data);

performance/Performance.Services/SecondAllotService.cs

@@ -387,6 +387,7 @@ private List<BodyItem> GetEmployees(int allotId, int userId, List<HeadItem> head
 
             Dictionary<(string, string), Func<per_employee, object>> dict = new Dictionary<(string, string), Func<per_employee, object>>
             {
+                { ("人员工号", "PersonnelNumber"), (t) => t.PersonnelNumber },
                 { ("姓名", "FullName"), (t) => t.DoctorName },
                 { ("岗位", "Post"), (t) => !string.IsNullOrEmpty(t.Duty) && (t.Duty.IndexOf("主任") > -1 || t.Duty.IndexOf("护士长") > -1) ? "主任" : "其他" },
                 { ("出勤", "ActualAttendance"), (t) => t.AttendanceDay },