医生详情修改

performance/Performance.Services/ComputeService.cs

@@ -1824,10 +1824,10 @@ public DeptDataDetails GetDoctorDetail(int computeId)
             var sheets = _perforPerSheetRepository.GetEntities(t => t.AllotID == resCompute.AllotID && types.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));
-            if (data == null || !data.Any(t => t.JobNumber == (resCompute.JobNumber ?? "") && t.EmployeeName == resCompute.EmployeeName)) return doctorDetails;
+            var data = _perforImDataRepository.GetEntities(t => t.AllotID == resCompute.AllotID && sheets.Select(s => s.ID).Contains(t.SheetID.Value)
+                && t.JobNumber == resCompute.JobNumber) ?? new List<im_data>();
+            data = data.Where(t => ((UnitType)t.UnitType).ToString() == resCompute.UnitType && t.AccountingUnit == resCompute.AccountingUnit).ToList();
 
-            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);