Merge branch 'v2020morge' into v2020morge-graphql

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

@@ -394,7 +394,7 @@ private List<BodyItem> GetEmployees(List<per_employee> employees, ag_secondallot
             var list = new List<BodyItem>();
 
             //var employees = personService.GetPersons(allotId, userId);
-            if (employees == null || !employees.Any(t => t.UnitType == unittype)) return list;
+            //if (employees == null || !employees.Any(t => t.UnitType == unittype)) return list;
 
             var hospital = hospitalRepository.GetEntity(t => t.ID == employees.First().HospitalId);
             if (hospital == null) return list;
@@ -409,7 +409,7 @@ private List<BodyItem> GetEmployees(List<per_employee> employees, ag_secondallot
 
             var perapramounts = perapramountRepository.GetEntities(t => t.AllotId == second.AllotId && t.Status == 3);
             Func<per_employee, decimal?> getAprAmount = (t) => second.Department == t.AccountingUnit ? perapramounts
-                ?.Where(w => w.DoctorName?.Trim() == t.DoctorName?.Trim() && w.PersonnelNumber?.Trim() == t.PersonnelNumber?.Trim())
+                ?.Where(w => w.PersonnelNumber?.Trim() == t.PersonnelNumber?.Trim())
                 ?.Sum(w => w.Amount) : 0;
 
             Dictionary<(string, string), Func<per_employee, object>> dict = new Dictionary<(string, string), Func<per_employee, object>>
@@ -1610,24 +1610,24 @@ public List<ag_othersource> OtherAutoComplete(SecondEmpRequest request, int user
         /// <param name="isTitlePerformance">是否补全职称绩效</param>
         private void SupplementSecondDetail(ag_secondallot second, List<per_employee> employees, List<ag_othersource> result, bool isTitlePerformance = true)
         {
-            if (employees == null || !employees.Any(t => t.UnitType == second.UnitType))
-                return;
+            //if (employees == null || !employees.Any(t => t.UnitType == second.UnitType))
+            //    return;
             // 补充医院其他绩效  及  预留比例
             var perapramounts = perapramountRepository.GetEntities(t => t.AllotId == second.AllotId && t.Status == 3);
             Func<per_employee, decimal?> getAprAmount = (t) => second.Department == t.AccountingUnit ? perapramounts
-                ?.Where(w => w.DoctorName?.Trim() == t.DoctorName?.Trim() && w.PersonnelNumber?.Trim() == t.PersonnelNumber?.Trim())
+                ?.Where(w => w.PersonnelNumber?.Trim() == t.PersonnelNumber?.Trim())
                 ?.Sum(w => w.Amount) : 0;
 
-            var distPerformance = rescomputeRepository.GetEntities(t => t.AllotID == second.AllotId && employees.Select(s => s.DoctorName).Contains(t.EmployeeName));
+            var distPerformance = rescomputeRepository.GetEntities(t => t.AllotID == second.AllotId && employees.Select(s => s.PersonnelNumber).Contains(t.JobNumber));
             Func<per_employee, decimal?> getDistPerformance = (t) => 0;
             if (second.UnitType == UnitType.行政后勤.ToString())
                 getDistPerformance = (t) => second.Department == t.AccountingUnit ? distPerformance
-                ?.Where(w => w.EmployeeName?.Trim() == t.DoctorName?.Trim() && w.JobNumber?.Trim() == t.PersonnelNumber?.Trim())
+                ?.Where(w => w.JobNumber?.Trim() == t.PersonnelNumber?.Trim())
                 ?.Sum(w => w.GiveFee) : 0;
 
             foreach (var item in result)
             {
-                var empl = employees.FirstOrDefault(w => w.PersonnelNumber?.Trim() == item.WorkNumber?.Trim() && w.DoctorName?.Trim() == item.Name?.Trim());
+                var empl = employees.FirstOrDefault(w => w.PersonnelNumber?.Trim() == item.WorkNumber?.Trim());
                 if (empl != null)
                 {
                     item.ReservedRatio = empl.ReservedRatio;
@@ -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>();
@@ -1762,6 +1762,7 @@ public List<SecondPerforResponse> DeptComputeDetail(int userId, int allotId, out
                 { application.DirectorRole, AccountUnitType.科主任.ToString() },
                 { application.NurseRole, AccountUnitType.护士长.ToString() },
                 { application.OfficeRole, AccountUnitType.行政中层.ToString() },
+                { application.SpecialRole, AccountUnitType.科主任.ToString() },
             };
 
             if (!dict.Keys.Contains(role.Type.Value)) return new List<SecondPerforResponse>();