Skip to content

Commit

Permalink
Feature 13067 case reference number on case and contact (#13088)
Browse files Browse the repository at this point in the history
  • Loading branch information
@leventegal-she
leventegal-she authored May 13, 2024
1 parent 2807299 commit 7b53ad4
Show file tree
Hide file tree
Showing 39 changed files with 314 additions and 129 deletions.
12 changes: 12 additions & 0 deletions sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
public static final String EXTERNAL_ID = "externalID";
public static final String EXTERNAL_TOKEN = "externalToken";
public static final String INTERNAL_TOKEN = "internalToken";
public static final String CASE_REFERENCE_NUMBER = "caseReferenceNumber";
public static final String SHARED_TO_COUNTRY = "sharedToCountry";
public static final String NOSOCOMIAL_OUTBREAK = "nosocomialOutbreak";
public static final String INFECTION_SETTING = "infectionSetting";
Expand Down Expand Up @@ -453,6 +454,9 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
@S2SIgnoreProperty(configProperty = SormasToSormasConfig.SORMAS2SORMAS_IGNORE_INTERNAL_TOKEN)
@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
private String internalToken;
@Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong)
@DependingOnFeatureType(featureType = FeatureType.SELF_REPORTING)
private String caseReferenceNumber;
private boolean sharedToCountry;
@HideForCountriesExcept
private boolean nosocomialOutbreak;
Expand Down Expand Up @@ -1268,6 +1272,14 @@ public void setInternalToken(String internalToken) {
this.internalToken = internalToken;
}

public String getCaseReferenceNumber() {
return caseReferenceNumber;
}

public void setCaseReferenceNumber(String caseReferenceNumber) {
this.caseReferenceNumber = caseReferenceNumber;
}

public boolean isSharedToCountry() {
return sharedToCountry;
}
Expand Down
81 changes: 48 additions & 33 deletions sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseExportDto.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import de.symeda.sormas.api.disease.DiseaseVariant;
import de.symeda.sormas.api.epidata.EpiDataDto;
import de.symeda.sormas.api.event.EventStatus;
import de.symeda.sormas.api.feature.FeatureType;
import de.symeda.sormas.api.hospitalization.HospitalizationDto;
import de.symeda.sormas.api.i18n.I18nProperties;
import de.symeda.sormas.api.immunization.ImmunizationDto;
Expand Down Expand Up @@ -57,6 +58,7 @@
import de.symeda.sormas.api.user.UserRight;
import de.symeda.sormas.api.user.UserRoleReferenceDto;
import de.symeda.sormas.api.utils.DataHelper;
import de.symeda.sormas.api.utils.DependingOnFeatureType;
import de.symeda.sormas.api.utils.DependingOnUserRight;
import de.symeda.sormas.api.utils.EmbeddedSensitiveData;
import de.symeda.sormas.api.utils.HideForCountries;
Expand Down Expand Up @@ -319,6 +321,7 @@ public class CaseExportDto extends AbstractUuidDto implements IsCase {
private String externalToken;
private String internalToken;

private String caseReferenceNumber;
@PersonalData
@SensitiveData
private String birthName;
Expand Down Expand Up @@ -389,7 +392,7 @@ public CaseExportDto(long id, long personId, Double personAddressLatitude, Doubl
//Date onsetDate,
VaccinationStatus vaccinationStatus, YesNoUnknown postpartum, Trimester trimester,
long eventCount, Long prescriptionCount, Long treatmentCount, Long clinicalVisitCount,
String externalID, String externalToken, String internalToken,
String externalID, String externalToken, String internalToken,String caseReferenceNumber,
String birthName, String birthCountryIsoCode, String birthCountryName, String citizenshipIsoCode, String citizenshipCountryName,
CaseIdentificationSource caseIdentificationSource, ScreeningType screeningType,
// responsible jurisdiction
Expand Down Expand Up @@ -516,6 +519,7 @@ public CaseExportDto(long id, long personId, Double personAddressLatitude, Doubl
this.externalID = externalID;
this.externalToken = externalToken;
this.internalToken = internalToken;
this.caseReferenceNumber = caseReferenceNumber;
this.birthName = birthName;
this.birthCountry = I18nProperties.getCountryName(birthCountryIsoCode, birthCountryName);
this.citizenship = I18nProperties.getCountryName(citizenshipIsoCode, citizenshipCountryName);
Expand Down Expand Up @@ -643,6 +647,17 @@ public String getInternalToken() {
}

@Order(7)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
@ExportProperty(CaseDataDto.CASE_REFERENCE_NUMBER)
@ExportGroup(ExportGroupType.CORE)
@DependingOnFeatureType(featureType = FeatureType.SELF_REPORTING)
public String getCaseReferenceNumber() {
return caseReferenceNumber;
}

@Order(8)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -652,7 +667,7 @@ public Disease getDisease() {
return disease;
}

@Order(8)
@Order(9)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -662,7 +677,7 @@ public String getDiseaseDetails() {
return diseaseDetails;
}

@Order(9)
@Order(10)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -672,7 +687,7 @@ public DiseaseVariant getDiseaseVariant() {
return diseaseVariant;
}

@Order(10)
@Order(11)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -682,7 +697,7 @@ public String getDiseaseVariantDetails() {
return diseaseVariantDetails;
}

@Order(11)
@Order(12)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -695,7 +710,7 @@ public String getPersonUuid() {
return personUuid;
}

@Order(12)
@Order(13)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -708,7 +723,7 @@ public String getFirstName() {
return firstName;
}

@Order(13)
@Order(14)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -721,7 +736,7 @@ public String getLastName() {
return lastName;
}

@Order(14)
@Order(15)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -735,7 +750,7 @@ public Salutation getSalutation() {
return salutation;
}

@Order(15)
@Order(16)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -749,7 +764,7 @@ public String getOtherSalutation() {
return otherSalutation;
}

@Order(16)
@Order(17)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -762,7 +777,7 @@ public Sex getSex() {
return sex;
}

@Order(17)
@Order(18)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -772,7 +787,7 @@ public YesNoUnknown getPregnant() {
return pregnant;
}

@Order(18)
@Order(19)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -782,7 +797,7 @@ public Trimester getTrimester() {
return trimester;
}

@Order(19)
@Order(20)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -792,7 +807,7 @@ public YesNoUnknown getPostpartum() {
return postpartum;
}

@Order(20)
@Order(21)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -805,7 +820,7 @@ public String getApproximateAge() {
return approximateAge;
}

@Order(21)
@Order(22)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -818,7 +833,7 @@ public String getAgeGroup() {
return ageGroup;
}

@Order(22)
@Order(23)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -829,7 +844,7 @@ public BirthDateDto getBirthdate() {
return birthdate;
}

@Order(23)
@Order(24)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -839,7 +854,7 @@ public Date getReportDate() {
return reportDate;
}

@Order(24)
@Order(25)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -849,7 +864,7 @@ public String getResponsibleRegion() {
return responsibleRegion;
}

@Order(25)
@Order(26)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -859,7 +874,7 @@ public String getResponsibleDistrict() {
return responsibleDistrict;
}

@Order(26)
@Order(27)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -869,7 +884,7 @@ public String getResponsibleCommunity() {
return responsibleCommunity;
}

@Order(27)
@Order(28)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -879,7 +894,7 @@ public String getRegion() {
return region;
}

@Order(28)
@Order(29)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -889,7 +904,7 @@ public String getDistrict() {
return district;
}

@Order(29)
@Order(30)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -899,7 +914,7 @@ public String getCommunity() {
return community;
}

@Order(30)
@Order(31)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -909,7 +924,7 @@ public FacilityType getFacilityType() {
return facilityType;
}

@Order(31)
@Order(32)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -919,7 +934,7 @@ public String getHealthFacility() {
return healthFacility;
}

@Order(32)
@Order(33)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -929,7 +944,7 @@ public String getHealthFacilityDetails() {
return healthFacilityDetails;
}

@Order(33)
@Order(34)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -939,7 +954,7 @@ public String getPointOfEntry() {
return pointOfEntry;
}

@Order(34)
@Order(35)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -949,7 +964,7 @@ public String getPointOfEntryDetails() {
return pointOfEntryDetails;
}

@Order(35)
@Order(36)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -959,7 +974,7 @@ public String getInitialDetectionPlace() {
return initialDetectionPlace;
}

@Order(36)
@Order(37)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE })
@ExportProperty(CaseDataDto.CASE_CLASSIFICATION)
Expand All @@ -968,7 +983,7 @@ public CaseClassification getCaseClassification() {
return caseClassification;
}

@Order(37)
@Order(38)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -978,7 +993,7 @@ public YesNoUnknown getClinicalConfirmation() {
return clinicalConfirmation;
}

@Order(38)
@Order(39)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand All @@ -988,7 +1003,7 @@ public YesNoUnknown getEpidemiologicalConfirmation() {
return epidemiologicalConfirmation;
}

@Order(39)
@Order(40)
@ExportTarget(caseExportTypes = {
CaseExportType.CASE_SURVEILLANCE,
CaseExportType.CASE_MANAGEMENT })
Expand Down
4 changes: 2 additions & 2 deletions sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseIndexDetailedDto.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public class CaseIndexDetailedDto extends CaseIndexDto {
private UserReferenceDto reportingUser;

//@formatter:off
public CaseIndexDetailedDto(long id, String uuid, String epidNumber, String externalID, String externalToken, String internalToken, String personUuid, String personFirstName, String personLastName,
public CaseIndexDetailedDto(long id, String uuid, String epidNumber, String externalID, String externalToken, String internalToken,String caseReferenceNumber, String personUuid, String personFirstName, String personLastName,
Disease disease, DiseaseVariant diseaseVariant, String diseaseDetails, CaseClassification caseClassification, InvestigationStatus investigationStatus,
PresentCondition presentCondition, Date reportDate, Date creationDate,
String regionUuid, String districtUuid,
Expand All @@ -88,7 +88,7 @@ public CaseIndexDetailedDto(long id, String uuid, String epidNumber, String exte
String reportingUserUuid, String reportingUserFirstName, String reportingUserLastName, Date symptomOnsetDate,
String responsibleRegion, String responsibleCommunity,
int visitCount, long eventCount, Date latestSampleDateTime, long sampleCount) {
super(id, uuid, epidNumber, externalID, externalToken, internalToken, personUuid, personFirstName, personLastName,
super(id, uuid, epidNumber, externalID, externalToken, internalToken, caseReferenceNumber, personUuid, personFirstName, personLastName,
disease, diseaseVariant, diseaseDetails, caseClassification, investigationStatus,
presentCondition, reportDate, creationDate,
regionUuid, districtUuid, healthFacilityUuid,
Expand Down
Loading

0 comments on commit 7b53ad4

Please sign in to comment.