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

Pull request #188: RSS-149: Removed out of scope components

Browse Source 
Merge in RED/redaction-report-service from RSS-149 to master

* commit '9ac0da1955175deef27fa254c0b33d9426fac9de':
  RSS-149: Removed out of scope components
This commit is contained in:
Dominique Eiflaender 2022-11-10 14:55:25 +01:00
commit 8db719e6e3
1 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<String> 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<String> 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<String> 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<String> 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<String> itty = uniqueMmad.iterator();
// while (itty.hasNext()) {
// stringBuilder.append(itty.next());
// if (itty.hasNext()) {
// stringBuilder.append(", ");
// }
// }
// return stringBuilder.toString().trim();
//
// }
private String getStudyConclusion(RedactionLog redactionLog) {