其他模板数据打印数据出错，接口内判断条件出错

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

@@ -58,7 +58,6 @@ public AutoMapperConfigs()
             CreateMap<AllotResponse, per_allot>();
             CreateMap<per_allot, AllotResponse>();
 
-
             // sheet 响应
             CreateMap<SheetResponse, per_sheet>()
                  .ForMember(dest => dest.ID, opt => opt.MapFrom(src => src.SheetID));
@@ -125,7 +124,6 @@ public AutoMapperConfigs()
                  .ForMember(dest => dest.DoctorGrant, opt => opt.MapFrom(src => src.Grant))
                  .ReverseMap();
 
-
             //CreateMap<im_accountbasic, PerDataAccountBaisc>()
             //     .ForMember(dest => dest.UnitType, opt => opt.MapFrom(src => ((UnitType)src.UnitType).ToString()))
             //     .ForMember(dest => dest.AccountingUnit, opt => opt.MapFrom(src => src.DoctorAccountingUnit))
@@ -162,7 +160,6 @@ public AutoMapperConfigs()
             CreateMap<res_account, DeptResponse>();
             //CreateMap<res_account, NurseResponse>();
 
-
             //二次绩效
             CreateMap<ag_header, PerHeader>();
             CreateMap<PerHeader, ag_header>();
@@ -222,7 +219,7 @@ public AutoMapperConfigs()
                 .ReverseMap();
 
             CreateMap<ag_othersource, SecPrintResponse>()
-               .ForMember(dest => dest.WorkPost, opt => opt.MapFrom(src => src.WorkNumber))
+               .ForMember(dest => dest.JobNumber, opt => opt.MapFrom(src => src.WorkNumber))
                .ForMember(dest => dest.PersonName, opt => opt.MapFrom(src => src.Name))
                .ForMember(dest => dest.TitlePerfor, opt => opt.MapFrom(src => src.TitlePerformance))
                .ReverseMap();
@@ -243,7 +240,6 @@ public AutoMapperConfigs()
 
         public void xx()
         {
-
         }
     }
 }

performance/Performance.Services/SecondAllotService.cs

@@ -1716,7 +1716,7 @@ public List<SecPrintResponse> Print(int secondId)
                 var itemname = new List<string> { "人员工号", "姓名", "职称", "职称绩效", "工作量绩效工资", "单项奖励小计", "可分配绩效", "医院其他绩效", "夜班工作量绩效" };
                 var fixaitems = perforAgfixatitemRepository.GetEntities(t => t.SecondId == secondId && itemname.Contains(t.ItemName));
 
-                if (fixaitems == null && !fixaitems.Any(t => t.RowNumber.HasValue && t.RowNumber != -1)) return new List<SecPrintResponse>();
+                if (fixaitems == null || !fixaitems.Any(t => t.RowNumber.HasValue && t.RowNumber != -1)) return new List<SecPrintResponse>();
 
                 var rownumbers = fixaitems.Where(t => t.RowNumber.HasValue && t.RowNumber != -1).Select(t => t.RowNumber.Value).Distinct().OrderBy(t => t).ToList();
                 var result = new List<SecPrintResponse>();