diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java index 9f7a7be..44bd79a 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java @@ -163,8 +163,8 @@ public class RSSPoc2Service { } if (oecdIn(oecd, Set.of("403"))) { - resultMap.put("MMAD", getMmad(redactionLog)); - resultMap.put("GSD", getGsd(redactionLog)); +// resultMap.put("MMAD", getMmad(redactionLog)); // Out of scope +// resultMap.put("GSD", getGsd(redactionLog)); // Out of scope var effectiveConcentrations = getEffectiveConcentrations(redactionLog); Iterator effectiveConcentrationsIterator = effectiveConcentrations.iterator(); @@ -192,7 +192,7 @@ public class RSSPoc2Service { if (oecdIn(oecd, Set.of("404"))) { resultMap.put("Dose_(ml/animal)", getDoseMlPerAnimal(redactionLog)); - resultMap.put("Was_there_dilution_of_the_test_substance?", getDilution(redactionLog)); +// resultMap.put("Was_there_dilution_of_the_test_substance?", getDilution(redactionLog)); // Out of scope. resultMap.put("Detailing_of_reported_changes", getAsOneBlock(redactionLog, "detailing")); } @@ -283,15 +283,15 @@ public class RSSPoc2Service { } - private String getDilution(RedactionLog redactionLog) { - - var dilution = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getType().equals("dilution")).map(RedactionLogEntry::getValue).findFirst(); - - if (dilution.isPresent()) { - return "Yes"; - } - return "No"; - } +// private String getDilution(RedactionLog redactionLog) { +// +// var dilution = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getType().equals("dilution")).map(RedactionLogEntry::getValue).findFirst(); +// +// if (dilution.isPresent()) { +// return "Yes"; +// } +// return "No"; +// } private String getDoseMlPerAnimal(RedactionLog redactionLog) { @@ -328,38 +328,38 @@ public class RSSPoc2Service { } - private String getGsd(RedactionLog redactionLog) { - - var uniqueGsd = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getType().equals("gsd")).map(RedactionLogEntry::getValue).collect(Collectors.toSet()); - - StringBuilder stringBuilder = new StringBuilder(); - Iterator itty = uniqueGsd.iterator(); - while (itty.hasNext()) { - stringBuilder.append(itty.next()); - if (itty.hasNext()) { - stringBuilder.append(", "); - } - } - return stringBuilder.toString().trim(); - - } +// private String getGsd(RedactionLog redactionLog) { +// +// var uniqueGsd = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getType().equals("gsd")).map(RedactionLogEntry::getValue).collect(Collectors.toSet()); +// +// StringBuilder stringBuilder = new StringBuilder(); +// Iterator itty = uniqueGsd.iterator(); +// while (itty.hasNext()) { +// stringBuilder.append(itty.next()); +// if (itty.hasNext()) { +// stringBuilder.append(", "); +// } +// } +// return stringBuilder.toString().trim(); +// +// } - private String getMmad(RedactionLog redactionLog) { - - var uniqueMmad = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getType().equals("mmad")).map(RedactionLogEntry::getValue).collect(Collectors.toSet()); - - StringBuilder stringBuilder = new StringBuilder(); - Iterator itty = uniqueMmad.iterator(); - while (itty.hasNext()) { - stringBuilder.append(itty.next()); - if (itty.hasNext()) { - stringBuilder.append(", "); - } - } - return stringBuilder.toString().trim(); - - } +// private String getMmad(RedactionLog redactionLog) { +// +// var uniqueMmad = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getType().equals("mmad")).map(RedactionLogEntry::getValue).collect(Collectors.toSet()); +// +// StringBuilder stringBuilder = new StringBuilder(); +// Iterator itty = uniqueMmad.iterator(); +// while (itty.hasNext()) { +// stringBuilder.append(itty.next()); +// if (itty.hasNext()) { +// stringBuilder.append(", "); +// } +// } +// return stringBuilder.toString().trim(); +// +// } private String getStudyConclusion(RedactionLog redactionLog) {