Merge branch 'feature/打印逻辑调整' into develop

performance/Performance.Services/SecondAllotService.cs

@@ -2086,18 +2086,25 @@ public List<SecPrintResponse> Print(int secondId)
             var second = agsecondallotRepository.GetEntity(t => t.Id == secondId);
             if (second == null) return new List<SecPrintResponse>();
 
+            var allot = perallotRepository.GetEntity(t => t.ID == second.AllotId);
+            if (allot == null) return new List<SecPrintResponse>();
+
+            var temps = agusetempRepository.GetEntities(w => w.HospitalId == allot.HospitalId && w.UnitType == second.UnitType && w.Department == second.Department);
+
+            var useTempId = second.UseTempId ?? temps?.OrderByDescending(w => w.Id).FirstOrDefault().UseTempId;
+
             //var computes = agcomputeRepository.GetEntities(t => t.SecondId == secondId);
             //if (computes == null || !computes.Any())
             //    return new List<SecPrintResponse>();
             List<SecPrintResponse> result = new List<SecPrintResponse>();
-            if (second.UseTempId.HasValue && second.UseTempId == 6)
+            if (useTempId.HasValue && useTempId == 6)
             {
                 var data = agothersourceRepository.GetEntities(t => t.SecondId == secondId);
                 if (data == null || !data.Any()) return new List<SecPrintResponse>();
 
                 result = Mapper.Map<List<SecPrintResponse>>(data);
             }
-            else if (second.UseTempId.HasValue && (new int[] { 9, 10 }).Contains(second.UseTempId.Value))
+            else if (useTempId.HasValue && (new int[] { 9, 10 }).Contains(useTempId.Value))
             {
                 var data = agbodysourceRepository.GetEntities(t => t.SecondId == secondId);
                 if (data == null || !data.Any()) return new List<SecPrintResponse>();
@@ -2120,7 +2127,7 @@ public List<SecPrintResponse> Print(int secondId)
                     NightWorkPerformance = w.NightWorkPerformance,
                 }).ToList();
             }
-            else
+            else if (useTempId.HasValue && (new int[] { 7, 8 }).Contains(useTempId.Value))
             {
                 var itemname = new List<string> { "人员工号", "姓名", "职称", "职称绩效", "工作量绩效工资", "单项奖励小计", "可分配绩效", "医院其他绩效", "夜班工作量绩效" };
                 var fixaitems = agfixatitemRepository.GetEntities(t => t.SecondId == secondId && itemname.Contains(t.ItemName));