Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 8e77121

Browse files
leventegal-sheleventegal-she
authored
Merge pull request SORMAS-Foundation#3056 from hzi-braunschweig/2950_export-address-community
SORMAS-Foundation#2950 added person address community on case, contact and event participant export
2 parents 4665c89 + ad2eb3a commit 8e77121

10 files changed

Lines changed: 103 additions & 44 deletions

File tree

‎sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseExportDto.java‎

Lines changed: 41 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ public class CaseExportDto implements Serializable {
8181
public static final String MAX_SOURCE_CASE_CLASSIFICATION = "maxSourceCaseClassification";
8282
public static final String ASSOCIATED_WITH_OUTBREAK = "associatedWithOutbreak";
8383
public static final String BURIAL_INFO = "burialInfo";
84+
public static final String ADDRESS_DISTRICT = "addressDistrict";
85+
public static final String ADDRESS_REGION = "addressRegion";
86+
public static final String ADDRESS_COMMUNITY = "addressCommunity";
8487
public static final String ADDRESS_GPS_COORDINATES = "addressGpsCoordinates";
8588
public static final String TRAVELED = "traveled";
8689
public static final String TRAVEL_HISTORY = "travelHistory";
@@ -153,6 +156,9 @@ public class CaseExportDto implements Serializable {
153156
private String addressDistrict;
154157
@PersonalData
155158
@SensitiveData
159+
private String addressCommunity;
160+
@PersonalData
161+
@SensitiveData
156162
private String city;
157163
@PersonalData
158164
@SensitiveData
@@ -249,7 +255,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
249255
boolean quarantineOfficialOrderSent, Date quarantineOfficialOrderSentDate,
250256
YesNoUnknown admittedToHealthFacility, Date admissionDate, Date dischargeDate, YesNoUnknown leftAgainstAdvice, PresentCondition presentCondition,
251257
Date deathDate, Date burialDate, BurialConductor burialConductor, String burialPlaceDescription,
252-
String addressRegion, String addressDistrict, String city, String street, String houseNumber, String additionalInformation, String postalCode,
258+
String addressRegion, String addressDistrict, String addressCommunity, String city, String street, String houseNumber, String additionalInformation, String postalCode,
253259
String facility, String facilityUuid, String facilityDetails,
254260
String phone, String phoneOwner, EducationType educationType, String educationDetails,
255261
OccupationType occupationType, String occupationDetails, YesNoUnknown traveled,
@@ -309,6 +315,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
309315
this.burialInfo = new BurialInfoDto(burialDate, burialConductor, burialPlaceDescription);
310316
this.addressRegion = addressRegion;
311317
this.addressDistrict = addressDistrict;
318+
this.addressCommunity = addressCommunity;
312319
this.city = city;
313320
this.street = street;
314321
this.houseNumber = houseNumber;
@@ -847,7 +854,7 @@ public BurialInfoDto getBurialInfo() {
847854
@ExportTarget(caseExportTypes = {
848855
CaseExportType.CASE_SURVEILLANCE,
849856
CaseExportType.CASE_MANAGEMENT })
850-
@ExportProperty(LocationDto.REGION)
857+
@ExportProperty(CaseExportDto.ADDRESS_REGION)
851858
@ExportGroup(ExportGroupType.SENSITIVE)
852859
public String getAddressRegion() {
853860
return addressRegion;
@@ -857,13 +864,23 @@ public String getAddressRegion() {
857864
@ExportTarget(caseExportTypes = {
858865
CaseExportType.CASE_SURVEILLANCE,
859866
CaseExportType.CASE_MANAGEMENT })
860-
@ExportProperty(LocationDto.DISTRICT)
867+
@ExportProperty(CaseExportDto.ADDRESS_DISTRICT)
861868
@ExportGroup(ExportGroupType.SENSITIVE)
862869
public String getAddressDistrict() {
863870
return addressDistrict;
864871
}
865872

866873
@Order(58)
874+
@ExportTarget(caseExportTypes = {
875+
CaseExportType.CASE_SURVEILLANCE,
876+
CaseExportType.CASE_MANAGEMENT })
877+
@ExportProperty(CaseExportDto.ADDRESS_COMMUNITY)
878+
@ExportGroup(ExportGroupType.SENSITIVE)
879+
public String getAddressCommunity() {
880+
return addressCommunity;
881+
}
882+
883+
@Order(59)
867884
@ExportTarget(caseExportTypes = {
868885
CaseExportType.CASE_SURVEILLANCE,
869886
CaseExportType.CASE_MANAGEMENT })
@@ -873,7 +890,7 @@ public String getCity() {
873890
return city;
874891
}
875892

876-
@Order(59)
893+
@Order(60)
877894
@ExportTarget(caseExportTypes = {
878895
CaseExportType.CASE_SURVEILLANCE,
879896
CaseExportType.CASE_MANAGEMENT })
@@ -883,7 +900,7 @@ public String getStreet() {
883900
return street;
884901
}
885902

886-
@Order(60)
903+
@Order(61)
887904
@ExportTarget(caseExportTypes = {
888905
CaseExportType.CASE_SURVEILLANCE,
889906
CaseExportType.CASE_MANAGEMENT })
@@ -893,7 +910,7 @@ public String getHouseNumber() {
893910
return houseNumber;
894911
}
895912

896-
@Order(61)
913+
@Order(70)
897914
@ExportTarget(caseExportTypes = {
898915
CaseExportType.CASE_SURVEILLANCE,
899916
CaseExportType.CASE_MANAGEMENT })
@@ -903,7 +920,7 @@ public String getAdditionalInformation() {
903920
return additionalInformation;
904921
}
905922

906-
@Order(62)
923+
@Order(71)
907924
@ExportTarget(caseExportTypes = {
908925
CaseExportType.CASE_SURVEILLANCE,
909926
CaseExportType.CASE_MANAGEMENT })
@@ -913,7 +930,7 @@ public String getPostalCode() {
913930
return postalCode;
914931
}
915932

916-
@Order(63)
933+
@Order(72)
917934
@ExportTarget(caseExportTypes = {
918935
CaseExportType.CASE_SURVEILLANCE,
919936
CaseExportType.CASE_MANAGEMENT })
@@ -923,7 +940,7 @@ public String getAddressGpsCoordinates() {
923940
return addressGpsCoordinates;
924941
}
925942

926-
@Order(63)
943+
@Order(73)
927944
@ExportTarget(caseExportTypes = {
928945
CaseExportType.CASE_SURVEILLANCE,
929946
CaseExportType.CASE_MANAGEMENT })
@@ -933,7 +950,7 @@ public String getFacility() {
933950
return facility;
934951
}
935952

936-
@Order(65)
953+
@Order(74)
937954
@ExportTarget(caseExportTypes = {
938955
CaseExportType.CASE_SURVEILLANCE,
939956
CaseExportType.CASE_MANAGEMENT })
@@ -943,7 +960,7 @@ public String getPhone() {
943960
return phone;
944961
}
945962

946-
@Order(66)
963+
@Order(75)
947964
@ExportTarget(caseExportTypes = {
948965
CaseExportType.CASE_SURVEILLANCE,
949966
CaseExportType.CASE_MANAGEMENT })
@@ -957,7 +974,7 @@ public void setEducationType(String educationType) {
957974
this.educationType = educationType;
958975
}
959976

960-
@Order(67)
977+
@Order(76)
961978
@ExportTarget(caseExportTypes = {
962979
CaseExportType.CASE_SURVEILLANCE,
963980
CaseExportType.CASE_MANAGEMENT })
@@ -967,7 +984,7 @@ public String getOccupationType() {
967984
return occupationType;
968985
}
969986

970-
@Order(69)
987+
@Order(77)
971988
@ExportTarget(caseExportTypes = {
972989
CaseExportType.CASE_SURVEILLANCE })
973990
@ExportProperty(TRAVELED)
@@ -980,7 +997,7 @@ public void setTraveled(YesNoUnknown traveled) {
980997
this.traveled = traveled;
981998
}
982999

983-
@Order(70)
1000+
@Order(78)
9841001
@ExportTarget(caseExportTypes = {
9851002
CaseExportType.CASE_SURVEILLANCE })
9861003
@ExportProperty(TRAVEL_HISTORY)
@@ -989,7 +1006,7 @@ public String getTravelHistory() {
9891006
return travelHistory;
9901007
}
9911008

992-
@Order(71)
1009+
@Order(79)
9931010
@ExportTarget(caseExportTypes = {
9941011
CaseExportType.CASE_SURVEILLANCE })
9951012
@ExportProperty(EpiDataDto.BURIAL_ATTENDED)
@@ -1002,7 +1019,7 @@ public void setBurialAttended(YesNoUnknown burialAttended) {
10021019
this.burialAttended = burialAttended;
10031020
}
10041021

1005-
@Order(72)
1022+
@Order(80)
10061023
@ExportTarget(caseExportTypes = {
10071024
CaseExportType.CASE_SURVEILLANCE })
10081025
@ExportProperty(EpiDataDto.DIRECT_CONTACT_CONFIRMED_CASE)
@@ -1015,7 +1032,7 @@ public void setDirectContactConfirmedCase(YesNoUnknown directContactConfirmedCas
10151032
this.directContactConfirmedCase = directContactConfirmedCase;
10161033
}
10171034

1018-
@Order(73)
1035+
@Order(90)
10191036
@ExportTarget(caseExportTypes = {
10201037
CaseExportType.CASE_SURVEILLANCE })
10211038
@ExportProperty(EpiDataDto.DIRECT_CONTACT_PROBABLE_CASE)
@@ -1028,7 +1045,7 @@ public void setDirectContactProbableCase(YesNoUnknown directContactProbableCase)
10281045
this.directContactProbableCase = directContactProbableCase;
10291046
}
10301047

1031-
@Order(74)
1048+
@Order(91)
10321049
@ExportTarget(caseExportTypes = {
10331050
CaseExportType.CASE_SURVEILLANCE })
10341051
@ExportProperty(EpiDataDto.RODENTS)
@@ -1037,7 +1054,7 @@ public YesNoUnknown getContactWithRodent() {
10371054
return contactWithRodent;
10381055
}
10391056

1040-
@Order(80)
1057+
@Order(92)
10411058
@ExportTarget(caseExportTypes = {
10421059
CaseExportType.CASE_SURVEILLANCE,
10431060
CaseExportType.CASE_MANAGEMENT })
@@ -1047,7 +1064,7 @@ public Vaccination getVaccination() {
10471064
return vaccination;
10481065
}
10491066

1050-
@Order(81)
1067+
@Order(93)
10511068
@ExportTarget(caseExportTypes = {
10521069
CaseExportType.CASE_SURVEILLANCE,
10531070
CaseExportType.CASE_MANAGEMENT })
@@ -1057,7 +1074,7 @@ public String getVaccinationDoses() {
10571074
return vaccinationDoses;
10581075
}
10591076

1060-
@Order(82)
1077+
@Order(94)
10611078
@ExportTarget(caseExportTypes = {
10621079
CaseExportType.CASE_SURVEILLANCE,
10631080
CaseExportType.CASE_MANAGEMENT })
@@ -1067,7 +1084,7 @@ public Date getVaccinationDate() {
10671084
return vaccinationDate;
10681085
}
10691086

1070-
@Order(83)
1087+
@Order(95)
10711088
@ExportTarget(caseExportTypes = {
10721089
CaseExportType.CASE_SURVEILLANCE,
10731090
CaseExportType.CASE_MANAGEMENT })
@@ -1077,12 +1094,12 @@ public VaccinationInfoSource getVaccinationInfoSource() {
10771094
return vaccinationInfoSource;
10781095
}
10791096

1080-
// @Order(90)
1097+
// @Order(96)
10811098
// public Date getOnsetDate() {
10821099
// return onsetDate;
10831100
// }
10841101
//
1085-
// @Order(91)
1102+
// @Order(97)
10861103
// public String getSymptoms() {
10871104
// return symptoms;
10881105
// }

0 commit comments

Comments
 (0)