接口优化

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

@@ -894,6 +894,11 @@
             核算单元 
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.PerDataAccountBaisc.EmployeeName">
+            <summary>
+            医生姓名
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.PerDataAccountBaisc.PermanentStaff">
             <summary>
             效率绩效人数
@@ -939,6 +944,16 @@
             考核对分率
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.PerDataAccountBaisc.AssessLaterManagementFee">
+            <summary>
+            考核后管理绩效
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.PerDataAccountBaisc.Management">
+            <summary>
+            管理绩效发放系数
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.PerDataAccountBaisc.AssessLaterOtherFee">
             <summary>
             考核后其他绩效

performance/Performance.Services/ComputeService.cs

@@ -1112,13 +1112,13 @@ public DeptDataDetails GetDoctorDetail(int computeId)
             var resCompute = _perforRescomputeRepository.GetEntity(t => t.ID == computeId);
             if (resCompute == null) return new DeptDataDetails();
 
-            var allot = perforPerallotRepository.GetEntity(t => t.ID == resCompute.AllotID);
-            if (allot == null) return new DeptDataDetails();
+            //var allot = perforPerallotRepository.GetEntity(t => t.ID == resCompute.AllotID);
+            //if (allot == null) return new DeptDataDetails();
 
             var employee = _perforImemployeeclinicRepository.GetEntity(t => t.AllotID == resCompute.AllotID && t.AccountingUnit == resCompute.AccountingUnit && t.UnitType == resCompute.UnitType && t.DoctorName == resCompute.EmployeeName);
             DeptDataDetails doctorDetails = new DeptDataDetails
             {
-                ShowFormula = allot.ShowFormula,
+                ShowFormula = 0,
                 Pandect = new PerDataAccountBaisc
                 {
                     AccountingUnit = resCompute.AccountingUnit,
@@ -1148,17 +1148,19 @@ public DeptDataDetails GetDoctorDetail(int computeId)
             var sheets = _perforPerSheetRepository.GetEntities(t => t.AllotID == resCompute.AllotID && new int[] { (int)SheetType.PersonExtra, (int)SheetType.PersonAdjustLaterOtherFee }.Contains(t.SheetType.Value));
             if (sheets == null || !sheets.Any()) return doctorDetails;
 
-            var data = _perforImDataRepository.GetEntities(t => t.AllotID == resCompute.AllotID && sheets.Select(s => s.ID).Contains(t.SheetID.Value) && t.JobNumber == (resCompute.JobNumber ?? "") && t.EmployeeName == resCompute.EmployeeName && t.AccountingUnit == resCompute.AccountingUnit);
-            if (data == null || !data.Any()) return doctorDetails;
+            var data = _perforImDataRepository.GetEntities(t => t.AllotID == resCompute.AllotID && sheets.Select(s => s.ID).Contains(t.SheetID.Value));
+            if (data == null || !data.Any(t => t.JobNumber == (resCompute.JobNumber ?? "") && t.EmployeeName == resCompute.EmployeeName)) return doctorDetails;
 
+            data = data.Where(t => t.JobNumber == (resCompute.JobNumber ?? "") && t.EmployeeName == resCompute.EmployeeName).ToList();
             foreach (var sheet in sheets)
             {
                 var sheetData = data.Where(t => t.SheetID == sheet.ID);
                 if (sheetData == null || !sheetData.Any()) continue;
 
+                var itemName = Regex.Replace(sheet.SheetName, @"\d", "");
                 var detail = new DetailDtos
                 {
-                    ItemName = sheet.SheetName,
+                    ItemName = itemName.Replace(".", "").Replace(" ", ""),
                     IncomeType = sheet.SheetType == (int)SheetType.PersonExtra ? 5 : 8,
                     Amount = sheetData.Where(t => t.IsTotal == 1)?.Sum(t => t.CellValue) ?? 0,
                     Items = sheetData.Where(t => t.IsTotal != 1)?.Select(t => new DetailModule