From c6caeb001c9e05568cfdb5f29e2c5d8bf006886b Mon Sep 17 00:00:00 2001 From: maverickstuder Date: Mon, 12 Aug 2024 14:50:47 +0200 Subject: [PATCH] RED-9782:Automated Analysis should be disabled when uploading a document that contains redactions from RedactManager * fix for findings --- .../v1/server/service/EntityLogConverterService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java index e869924..e605217 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java @@ -70,8 +70,8 @@ public class EntityLogConverterService { private Map fillMapOfTypeAndEntityDisplayName(String dossierId) { List 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 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)); } }