diff --git a/Service/Import/Perseh/PersehReader.cs b/Service/Import/Perseh/PersehReader.cs index 070803a17..680365ddc 100644 --- a/Service/Import/Perseh/PersehReader.cs +++ b/Service/Import/Perseh/PersehReader.cs @@ -111,7 +111,11 @@ namespace BeWo.Service.Import.Perseh } if (result.Ziele.Count == 0) // Keine Ziele gefunden, versuche LWV Version { - result.Ziele = ErstelleAlleZieleLWV(processor); + if (pdfText.Contains("Landeswohlfahrtsverband Hessen")) + { + result.Ziele = ErstelleAlleZieleLWV(processor); + } + } } } diff --git a/Service/Plugins/CustomerService.cs b/Service/Plugins/CustomerService.cs index e9342ddf5..0a650dc66 100644 --- a/Service/Plugins/CustomerService.cs +++ b/Service/Plugins/CustomerService.cs @@ -203,7 +203,9 @@ namespace BeWo.Service.Plugins pEntity.Customer2CostBearerList.DoForEach(c2cb => dc.CostBearerReferenceNumbers[c2cb.CostBearer.Oid.Value] = c2cb.ReferenceNumber); } - SetTeamAndEmployeeRelation(dc, currentEmployeeOid, pEntity, teamOids); + dc.CustomerCareTypes = string.Join("|", pEntity.ValueList.FindByType(ValueListEntryType.CustomerCareType).Select(e2o => e2o.Entry.Value)); + + SetTeamAndEmployeeRelation(dc, currentEmployeeOid, pEntity, teamOids); if (fetchEmployees) { @@ -1409,8 +1411,17 @@ namespace BeWo.Service.Plugins if (scdemo != null) { var scDCdemo = MapperFactory.SupportConceptDC_SupportConcept.MapToNewDC(scdemo); - MatchZiele(hidc, scDCdemo); - result.ImportedSupportConcept = scDCdemo; + var msg = MatchZiele(hidc, scDCdemo); + + if (!String.IsNullOrEmpty(msg)) + { + result.ImportMessage = msg; + } + else + { + result.ImportedSupportConcept = scDCdemo; + } + return result; }