Merge branch 'more-results' into 'develop'

name of the report without extension and treatment related fingind field

See merge request !7

src/main/java/es/bsc/inb/ades/export/json/main/App.java

@@ -219,7 +219,7 @@ public class App {
 		//document.addProperty("textWithAnnotations", new String(Files.readAllBytes(inputFile.getAbsoluteFile().toPath()), StandardCharsets.UTF_8));
 		
 		annotated_document.addProperty("id", id_document);
-		annotated_document.addProperty("name", name);
+		annotated_document.addProperty("name", fileNameWithOutExt);
 		
 		JsonObject section = new JsonObject();
 		section.addProperty("name", "document");
@@ -246,7 +246,7 @@ public class App {
     	Date date = new Date();
     	JsonObject text_document = new JsonObject();
     	text_document.addProperty("id", id_document);
-    	text_document.addProperty("name", name);
+    	text_document.addProperty("name", fileNameWithOutExt);
     	text_document.addProperty("fileName", name);
     	text_document.addProperty("processDate", dateFormat.format(date));
     	text_document.addProperty("text", plainText);
@@ -717,6 +717,14 @@ public class App {
 		}
 		srDomainFindingList.add(srDomainFinding);
 		
+		
+		List<Annotation> is_treatment_related_ = annotations_findings_by_type.get("IS_TREATMENT_RELATED");
+		if(is_treatment_related_!=null) {
+			Annotation is_treatment_related = is_treatment_related_.get(0);
+			String is_treatment_related_sendcode = is_treatment_related.getFeatures().get("value").toString();
+			srDomainFinding.setSRTRTEF(is_treatment_related_sendcode);
+		}
+		
 		List<Annotation> dose_ = annotations_findings_by_type.get("DOSE");
 		if(dose_!=null) {
 			Annotation dose = dose_.get(0);
@@ -815,6 +823,10 @@ public class App {
 				}
 			}
 		}
+		
+		
+		
+		
 		return srDomainFindingList;
 	}