Skip to content

Commit 4227118

Browse files
raulbobraulbob
authored
Merge pull request #13332 from SORMAS-Foundation/feature-13294_doctor_declarations_xml_esante_adapter
Feature 13294 doctor declarations xml esante adapter
2 parents 1906a87 + 2e27b25 commit 4227118

31 files changed

Lines changed: 2324 additions & 457 deletions

File tree

‎sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java‎

Lines changed: 182 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import de.symeda.sormas.api.Disease;
2626
import de.symeda.sormas.api.audit.AuditIncludeProperty;
2727
import de.symeda.sormas.api.audit.AuditedClass;
28+
import de.symeda.sormas.api.caze.CaseClassification;
2829
import de.symeda.sormas.api.caze.VaccinationStatus;
2930
import de.symeda.sormas.api.caze.surveillancereport.SurveillanceReportReferenceDto;
3031
import de.symeda.sormas.api.disease.DiseaseVariant;
@@ -37,6 +38,7 @@
3738
import de.symeda.sormas.api.person.PresentCondition;
3839
import de.symeda.sormas.api.person.Sex;
3940
import de.symeda.sormas.api.sormastosormas.SormasToSormasShareableDto;
41+
import de.symeda.sormas.api.symptoms.SymptomsDto;
4042
import de.symeda.sormas.api.user.UserReferenceDto;
4143
import de.symeda.sormas.api.utils.DataHelper;
4244
import de.symeda.sormas.api.utils.DependingOnFeatureType;
@@ -55,7 +57,9 @@ public class ExternalMessageDto extends SormasToSormasShareableDto {
5557
public static final String DISEASE_VARIANT = "diseaseVariant";
5658
public static final String DISEASE_VARIANT_DETAILS = "diseaseVariantDetails";
5759
public static final String MESSAGE_DATE_TIME = "messageDateTime";
60+
public static final String CASE_CLASSIFICATION = "caseClassification";
5861
public static final String CASE_REPORT_DATE = "caseReportDate";
62+
public static final String CASE_SYMPTOMS = "caseSymptoms";
5963
public static final String REPORTER_NAME = "reporterName";
6064
public static final String REPORTER_EXTERNAL_ID = "reporterExternalId";
6165
public static final String REPORTER_POSTAL_CODE = "reporterPostalCode";
@@ -77,6 +81,11 @@ public class ExternalMessageDto extends SormasToSormasShareableDto {
7781
public static final String PERSON_HOUSE_NUMBER = "personHouseNumber";
7882
public static final String PERSON_COUNTRY = "personCountry";
7983
public static final String PERSON_FACILITY = "personFacility";
84+
public static final String PERSON_GUARDIAN_FIRST_NAME = "personGuardianFirstName";
85+
public static final String PERSON_GUARDIAN_LAST_NAME = "personGuardianLastName";
86+
public static final String PERSON_GUARDIAN_RELATIONSHIP = "personGuardianRelationship";
87+
public static final String PERSON_GUARDIAN_PHONE = "personGuardianPhone";
88+
public static final String PERSON_GUARDIAN_EMAIL = "personGuardianEmail";
8089
public static final String EXTERNAL_MESSAGE_DETAILS = "externalMessageDetails";
8190
public static final String PROCESSED = "processed";
8291
public static final String REPORT_ID = "reportId";
@@ -85,6 +94,15 @@ public class ExternalMessageDto extends SormasToSormasShareableDto {
8594
public static final String ASSIGNEE = "assignee";
8695
public static final String SURVEILLANCE_REPORT = "surveillanceReport";
8796
public static final String AUTOMATIC_PROCESSING_POSSIBLE = "automaticProcessingPossible";
97+
public static final String NOTIFIER_FIRST_NAME = "notifierFirstName";
98+
public static final String NOTIFIER_LAST_NAME = "notifierLastName";
99+
public static final String NOTIFIER_REGISTRATION_NUMBER = "notifierRegistrationNumber";
100+
public static final String NOTIFIER_ADDRESS = "notifierAddress";
101+
public static final String NOTIFIER_EMAIL = "notifierEmail";
102+
public static final String NOTIFIER_PHONE = "notifierPhone";
103+
public static final String TREATMENT_STARTED = "treatmentStarted";
104+
public static final String TREATMENT_STARTED_DATE = "treatmentStartedDate";
105+
public static final String DIAGNOSTIC_DATE = "diagnosticDate";
88106

89107
@AuditIncludeProperty
90108
private ExternalMessageType type;
@@ -94,7 +112,10 @@ public class ExternalMessageDto extends SormasToSormasShareableDto {
94112
private String diseaseVariantDetails;
95113
@AuditIncludeProperty
96114
private Date messageDateTime;
115+
116+
private CaseClassification caseClassification;
97117
private Date caseReportDate;
118+
private SymptomsDto caseSymptoms;
98119

99120
@Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong)
100121
private String reporterName;
@@ -137,6 +158,20 @@ public class ExternalMessageDto extends SormasToSormasShareableDto {
137158
private PhoneNumberType personPhoneNumberType;
138159
@Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong)
139160
private String personEmail;
161+
@Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong)
162+
private String personGuardianFirstName;
163+
@Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong)
164+
private String personGuardianLastName;
165+
@Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong)
166+
private String personGuardianRelationship;
167+
@Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong)
168+
private String personGuardianPhone;
169+
@Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong)
170+
private String personGuardianEmail;
171+
private String treatmentStarted;
172+
private Date treatmentStartedDate;
173+
private Date diagnosticDate;
174+
140175
@AuditIncludeProperty
141176
private List<SampleReportDto> sampleReports;
142177
@AuditIncludeProperty
@@ -167,6 +202,24 @@ public class ExternalMessageDto extends SormasToSormasShareableDto {
167202

168203
private YesNoUnknown admittedToHealthFacility;
169204

205+
@Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong)
206+
private String notifierFirstName;
207+
208+
@Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong)
209+
private String notifierLastName;
210+
211+
@Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong)
212+
private String notifierRegistrationNumber;
213+
214+
@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
215+
private String notifierAddress;
216+
217+
@Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong)
218+
private String notifierEmail;
219+
220+
@Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong)
221+
private String notifierPhone;
222+
170223
public ExternalMessageType getType() {
171224
return type;
172225
}
@@ -207,6 +260,14 @@ public void setMessageDateTime(Date messageDateTime) {
207260
this.messageDateTime = messageDateTime;
208261
}
209262

263+
public CaseClassification getCaseClassification() {
264+
return caseClassification;
265+
}
266+
267+
public void setCaseClassification(CaseClassification caseClassification) {
268+
this.caseClassification = caseClassification;
269+
}
270+
210271
public Date getCaseReportDate() {
211272
return caseReportDate;
212273
}
@@ -215,6 +276,14 @@ public void setCaseReportDate(Date caseReportDate) {
215276
this.caseReportDate = caseReportDate;
216277
}
217278

279+
public void setCaseSymptoms(SymptomsDto caseSymptoms) {
280+
this.caseSymptoms = caseSymptoms;
281+
}
282+
283+
public SymptomsDto getCaseSymptoms() {
284+
return caseSymptoms;
285+
}
286+
218287
public String getReporterName() {
219288
return reporterName;
220289
}
@@ -391,6 +460,46 @@ public void setPersonEmail(String personEmail) {
391460
this.personEmail = personEmail;
392461
}
393462

463+
public String getPersonGuardianFirstName() {
464+
return personGuardianFirstName;
465+
}
466+
467+
public void setPersonGuardianFirstName(String personGuardianFirstName) {
468+
this.personGuardianFirstName = personGuardianFirstName;
469+
}
470+
471+
public String getPersonGuardianLastName() {
472+
return personGuardianLastName;
473+
}
474+
475+
public void setPersonGuardianLastName(String personGuardianLastName) {
476+
this.personGuardianLastName = personGuardianLastName;
477+
}
478+
479+
public String getPersonGuardianRelationship() {
480+
return personGuardianRelationship;
481+
}
482+
483+
public void setPersonGuardianRelationship(String personGuardianRelationship) {
484+
this.personGuardianRelationship = personGuardianRelationship;
485+
}
486+
487+
public String getPersonGuardianPhone() {
488+
return personGuardianPhone;
489+
}
490+
491+
public void setPersonGuardianPhone(String personGuardianPhone) {
492+
this.personGuardianPhone = personGuardianPhone;
493+
}
494+
495+
public String getPersonGuardianEmail() {
496+
return personGuardianEmail;
497+
}
498+
499+
public void setPersonGuardianEmail(String personGuardianEmail) {
500+
this.personGuardianEmail = personGuardianEmail;
501+
}
502+
394503
public String getExternalMessageDetails() {
395504
return externalMessageDetails;
396505
}
@@ -455,6 +564,78 @@ public void setAdmittedToHealthFacility(YesNoUnknown admittedToHealthFacility) {
455564
this.admittedToHealthFacility = admittedToHealthFacility;
456565
}
457566

567+
public String getNotifierFirstName() {
568+
return notifierFirstName;
569+
}
570+
571+
public void setNotifierFirstName(String notifierFirstName) {
572+
this.notifierFirstName = notifierFirstName;
573+
}
574+
575+
public String getNotifierLastName() {
576+
return notifierLastName;
577+
}
578+
579+
public void setNotifierLastName(String notifierLastName) {
580+
this.notifierLastName = notifierLastName;
581+
}
582+
583+
public String getNotifierRegistrationNumber() {
584+
return notifierRegistrationNumber;
585+
}
586+
587+
public void setNotifierRegistrationNumber(String notifierRegistrationNumber) {
588+
this.notifierRegistrationNumber = notifierRegistrationNumber;
589+
}
590+
591+
public String getNotifierAddress() {
592+
return notifierAddress;
593+
}
594+
595+
public void setNotifierAddress(String notifierAddress) {
596+
this.notifierAddress = notifierAddress;
597+
}
598+
599+
public String getNotifierEmail() {
600+
return notifierEmail;
601+
}
602+
603+
public void setNotifierEmail(String notifierEmail) {
604+
this.notifierEmail = notifierEmail;
605+
}
606+
607+
public String getNotifierPhone() {
608+
return notifierPhone;
609+
}
610+
611+
public void setNotifierPhone(String notifierPhone) {
612+
this.notifierPhone = notifierPhone;
613+
}
614+
615+
public String getTreatmentStarted() {
616+
return treatmentStarted;
617+
}
618+
619+
public void setTreatmentStarted(String treatmentStarted) {
620+
this.treatmentStarted = treatmentStarted;
621+
}
622+
623+
public Date getTreatmentStartedDate() {
624+
return treatmentStartedDate;
625+
}
626+
627+
public void setTreatmentStartedDate(Date treatmentStartedDate) {
628+
this.treatmentStartedDate = treatmentStartedDate;
629+
}
630+
631+
public Date getDiagnosticDate() {
632+
return diagnosticDate;
633+
}
634+
635+
public void setDiagnosticDate(Date diagnosticDate) {
636+
this.diagnosticDate = diagnosticDate;
637+
}
638+
458639
public static ExternalMessageDto build() {
459640

460641
ExternalMessageDto message = new ExternalMessageDto();
@@ -540,4 +721,5 @@ public String getPersonAdditionalDetails() {
540721
public void setPersonAdditionalDetails(String personAdditionalDetails) {
541722
this.personAdditionalDetails = personAdditionalDetails;
542723
}
724+
543725
}

0 commit comments

Comments
 (0)