Marmelator/redaction-report-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 129 Wiki Activity

Merge branch 'RED-9782-bp' into 'release/4.73.x'

Browse Source 
RED-9782:Automated Analysis should be disabled when uploading a document that...

See merge request redactmanager/redaction-report-service!92
This commit is contained in:
Maverick Studer 2024-08-12 18:41:03 +02:00
commit 4df06b4bad
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java
View File

@ -70,8 +70,8 @@ public class EntityLogConverterService {
private Map<String, String> fillMapOfTypeAndEntityDisplayName(String dossierId) {
List<Type> typeList = new ArrayList<>();
typeList.addAll(dictionaryClient.getAllTypesForDossier(dossierId, false));
typeList.addAll(dictionaryClient.getAllTypesForDossierTemplate(dossierClient.getDossierById(dossierId, true, false).getDossierTemplateId(), false));
typeList.addAll(dictionaryClient.getAllTypesForDossier(dossierId, true));
typeList.addAll(dictionaryClient.getAllTypesForDossierTemplate(dossierClient.getDossierById(dossierId, true, false).getDossierTemplateId(), true));
Map<String, String> mapOfEntityDisplayName = new HashMap<>();
@ -174,7 +174,8 @@ public class EntityLogConverterService {
.orElse(""),
checkTextForNull(entry.getTextBefore()) + entry.getValue() + checkTextForNull(entry.getTextAfter()),
entry.getValue(),
mapOfEntityDisplayName.get(entry.getType()),
mapOfEntityDisplayName.get(entry.getType())
== null ? entry.getType() : mapOfEntityDisplayName.get(entry.getType()),
entry.getState() == EntryState.SKIPPED || entry.getState() == EntryState.IGNORED));
}
}