Merge pull request SORMAS-Foundation#4033 from hzi-braunschweig/3820-demis-testResultText

SORMAS-Foundation#3820 demis lab message test result text

Author: FredrikSchaefer

sormas-api/src/main/java/de/symeda/sormas/api/labmessage/LabMessageDto.java

@@ -41,6 +41,7 @@ public class LabMessageDto extends EntityDto {
 	public static final String PERSON_HOUSE_NUMBER = "personHouseNumber";
 	public static final String LAB_MESSAGE_DETAILS = "labMessageDetails";
 	public static final String PROCESSED = "processed";
+	public static final String TEST_RESULT_TEXT = "testResultText";
 
 	private Date messageDateTime;
 	private Date sampleDateTime;
@@ -70,6 +71,7 @@ public class LabMessageDto extends EntityDto {
 	private String labMessageDetails;
 
 	private boolean processed;
+	private String testResultText;
 
 	public Date getMessageDateTime() {
 		return messageDateTime;
@@ -279,6 +281,14 @@ public void setProcessed(boolean processed) {
 		this.processed = processed;
 	}
 
+	public String getTestResultText() {
+		return testResultText;
+	}
+
+	public void setTestResultText(String testResultText) {
+		this.testResultText = testResultText;
+	}
+
 	public static LabMessageDto build() {
 
 		LabMessageDto labMessage = new LabMessageDto();

sormas-backend/src/main/java/de/symeda/sormas/backend/labmessage/LabMessage.java

@@ -1,5 +1,6 @@
 package de.symeda.sormas.backend.labmessage;
 
+import static de.symeda.sormas.api.EntityDto.COLUMN_LENGTH_BIG;
 import static de.symeda.sormas.api.EntityDto.COLUMN_LENGTH_DEFAULT;
 
 import java.util.Date;
@@ -54,6 +55,7 @@ public class LabMessage extends AbstractDomainObject {
 	public static final String PERSON_HOUSE_NUMBER = "personHouseNumber";
 	public static final String LAB_MESSAGE_DETAILS = "labMessageDetails";
 	public static final String PROCESSED = "processed";
+	public static final String TEST_RESULT_TEXT = "testResultText";
 
 	private Date messageDateTime;
 	private Date sampleDateTime;
@@ -83,6 +85,7 @@ public class LabMessage extends AbstractDomainObject {
 	private String labMessageDetails;
 
 	private boolean processed;
+	private String testResultText;
 
 	@Temporal(TemporalType.TIMESTAMP)
 	public Date getMessageDateTime() {
@@ -317,4 +320,13 @@ public boolean isProcessed() {
 	public void setProcessed(boolean processed) {
 		this.processed = processed;
 	}
+
+	@Column(length = COLUMN_LENGTH_BIG)
+	public String getTestResultText() {
+		return testResultText;
+	}
+
+	public void setTestResultText(String testResultText) {
+		this.testResultText = testResultText;
+	}
 }

sormas-backend/src/main/java/de/symeda/sormas/backend/labmessage/LabMessageFacadeEjb.java

@@ -77,6 +77,7 @@ private LabMessage fromDto(@NotNull LabMessageDto source, LabMessage target, boo
 		target.setTestLabPostalCode(source.getTestLabPostalCode());
 		target.setTestResult(source.getTestResult());
 		target.setTestType(source.getTestType());
+		target.setTestResultText(source.getTestResultText());
 
 		return target;
 	}
@@ -124,6 +125,7 @@ public LabMessageDto toDto(LabMessage source) {
 		target.setTestLabPostalCode(source.getTestLabPostalCode());
 		target.setTestResult(source.getTestResult());
 		target.setTestType(source.getTestType());
+		target.setTestResultText(source.getTestResultText());
 
 		return target;
 	}

sormas-backend/src/main/resources/sql/sormas_schema.sql

@@ -6296,4 +6296,9 @@ ALTER TABLE exportconfiguration_history
 
 INSERT INTO schema_version (version_number, comment) VALUES (313, 'Allow specific users to create public custom exports #1754');
 
+-- 2021-01-11 Add testresulttext to labmessage #3820
+ALTER TABLE labmessage ADD COLUMN testresulttext TEXT;
+ALTER TABLE labmessage_history ADD COLUMN testresulttext TEXT;
+
+INSERT INTO schema_version (version_number, comment) VALUES (314, 'Add testresulttext to labmessage #3820');
 -- *** Insert new sql commands BEFORE this line ***

sormas-ui/src/main/java/de/symeda/sormas/ui/labmessage/LabMessageController.java

@@ -312,6 +312,7 @@ private void createPathogenTest(SampleDto sampleDto, LabMessageDto labMessageDto
 		pathogenTestDto.setTestType(labMessageDto.getTestType());
 		pathogenTestDto.setTestedDisease(labMessageDto.getTestedDisease());
 		pathogenTestDto.setTestDateTime(labMessageDto.getTestDateTime());
+		pathogenTestDto.setTestResultText(labMessageDto.getTestResultText());
 
 		Window window = VaadinUiUtil.createPopupWindow();