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

Commit 63958ad

Browse files
lgallgal
lgal
authored and
lgal
committed
SORMAS-Foundation#3416 export nosocomial outbreak and infection setting fields
1 parent 65fbc24 commit 63958ad

6 files changed

Lines changed: 75 additions & 45 deletions

File tree

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

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ public class CaseDataDto extends PseudonymizableDto {
127127
public static final String ADDITIONAL_DETAILS = "additionalDetails";
128128
public static final String EXTERNAL_ID = "externalID";
129129
public static final String SHARED_TO_COUNTRY = "sharedToCountry";
130+
public static final String NOSOCOMIAL_OUTBREAK = "nosocomialOutbreak";
131+
public static final String INFECTION_SETTING = "infectionSetting";
130132
public static final String QUARANTINE = "quarantine";
131133
public static final String QUARANTINE_TYPE_DETAILS = "quarantineTypeDetails";
132134
public static final String QUARANTINE_FROM = "quarantineFrom";
@@ -165,9 +167,6 @@ public class CaseDataDto extends PseudonymizableDto {
165167
public static final String END_OF_ISOLATION_REASON = "endOfIsolationReason";
166168
public static final String END_OF_ISOLATION_REASON_DETAILS = "endOfIsolationReasonDetails";
167169

168-
public static final String NOSOCOMIAL_OUTBREAK = "nosocomialOutbreak";
169-
public static final String INFECTION_SETTING = "infectionSetting";
170-
171170
// Fields are declared in the order they should appear in the import template
172171

173172
@Outbreaks
@@ -370,6 +369,10 @@ public class CaseDataDto extends PseudonymizableDto {
370369
COUNTRY_CODE_SWITZERLAND })
371370
private String externalID;
372371
private boolean sharedToCountry;
372+
@HideForCountriesExcept
373+
private boolean nosocomialOutbreak;
374+
@HideForCountriesExcept
375+
private InfectionSetting infectionSetting;
373376
private QuarantineType quarantine;
374377
@SensitiveData
375378
private String quarantineTypeDetails;
@@ -446,10 +449,6 @@ public class CaseDataDto extends PseudonymizableDto {
446449
@HideForCountriesExcept(countries = COUNTRY_CODE_SWITZERLAND)
447450
@SensitiveData
448451
private String endOfIsolationReasonDetails;
449-
@HideForCountriesExcept
450-
private boolean nosocomialOutbreak;
451-
@HideForCountriesExcept
452-
private InfectionSetting infectionSetting;
453452

454453
public static CaseDataDto build(PersonReferenceDto person, Disease disease) {
455454
return build(person, disease, null);
@@ -1015,6 +1014,22 @@ public void setSharedToCountry(boolean sharedToCountry) {
10151014
this.sharedToCountry = sharedToCountry;
10161015
}
10171016

1017+
public boolean isNosocomialOutbreak() {
1018+
return nosocomialOutbreak;
1019+
}
1020+
1021+
public void setNosocomialOutbreak(boolean nosocomialOutbreak) {
1022+
this.nosocomialOutbreak = nosocomialOutbreak;
1023+
}
1024+
1025+
public InfectionSetting getInfectionSetting() {
1026+
return infectionSetting;
1027+
}
1028+
1029+
public void setInfectionSetting(InfectionSetting infectionSetting) {
1030+
this.infectionSetting = infectionSetting;
1031+
}
1032+
10181033
public QuarantineType getQuarantine() {
10191034
return quarantine;
10201035
}
@@ -1295,22 +1310,6 @@ public void setEndOfIsolationReasonDetails(String endOfIsolationReasonDetails) {
12951310
this.endOfIsolationReasonDetails = endOfIsolationReasonDetails;
12961311
}
12971312

1298-
public boolean isNosocomialOutbreak() {
1299-
return nosocomialOutbreak;
1300-
}
1301-
1302-
public void setNosocomialOutbreak(boolean nosocomialOutbreak) {
1303-
this.nosocomialOutbreak = nosocomialOutbreak;
1304-
}
1305-
1306-
public InfectionSetting getInfectionSetting() {
1307-
return infectionSetting;
1308-
}
1309-
1310-
public void setInfectionSetting(InfectionSetting infectionSetting) {
1311-
this.infectionSetting = infectionSetting;
1312-
}
1313-
13141313
public SormasToSormasOriginInfoDto getSormasToSormasOriginInfo() {
13151314
return sormasToSormasOriginInfo;
13161315
}

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

Lines changed: 48 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,11 @@ public class CaseExportDto implements Serializable {
208208
private EmbeddedSampleExportDto sample3 = new EmbeddedSampleExportDto();
209209
private List<EmbeddedSampleExportDto> otherSamples = new ArrayList<>();
210210

211+
@HideForCountriesExcept
212+
private Boolean nosocomialOutbreak;
213+
@HideForCountriesExcept
214+
private InfectionSetting infectionSetting;
215+
211216
private QuarantineType quarantine;
212217
@SensitiveData
213218
private String quarantineTypeDetails;
@@ -252,6 +257,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
252257
String pointOfEntryUuid, String pointOfEntryDetails, CaseClassification caseClassification,
253258
InvestigationStatus investigationStatus, CaseOutcome outcome,
254259
FollowUpStatus followUpStatus, Date followUpUntil,
260+
Boolean nosocomialOutbreak, InfectionSetting infectionSetting,
255261
// Quarantine
256262
QuarantineType quarantine, String quarantineTypeDetails, Date quarantineFrom, Date quarantineTo,
257263
boolean quarantineOrderedVerbally, boolean quarantineOrderedOfficialDocument, Date quarantineOrderedVerballyDate,
@@ -296,6 +302,8 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
296302
this.caseClassification = caseClassification;
297303
this.investigationStatus = investigationStatus;
298304
this.outcome = outcome;
305+
this.nosocomialOutbreak = nosocomialOutbreak;
306+
this.infectionSetting = infectionSetting;
299307
this.quarantine = quarantine;
300308
this.quarantineTypeDetails = quarantineTypeDetails;
301309
this.quarantineFrom = quarantineFrom;
@@ -628,6 +636,26 @@ public CaseOutcome getOutcome() {
628636
}
629637

630638
@Order(33)
639+
@ExportTarget(caseExportTypes = {
640+
CaseExportType.CASE_SURVEILLANCE,
641+
CaseExportType.CASE_MANAGEMENT })
642+
@ExportProperty(value = CaseDataDto.NOSOCOMIAL_OUTBREAK, combined = true)
643+
@ExportGroup(ExportGroupType.ADDITIONAL)
644+
public Boolean getNosocomialOutbreak() {
645+
return nosocomialOutbreak;
646+
}
647+
648+
@Order(34)
649+
@ExportTarget(caseExportTypes = {
650+
CaseExportType.CASE_SURVEILLANCE,
651+
CaseExportType.CASE_MANAGEMENT })
652+
@ExportProperty(value = CaseDataDto.INFECTION_SETTING, combined = true)
653+
@ExportGroup(ExportGroupType.ADDITIONAL)
654+
public InfectionSetting getInfectionSetting() {
655+
return infectionSetting;
656+
}
657+
658+
@Order(35)
631659
@ExportTarget(caseExportTypes = {
632660
CaseExportType.CASE_SURVEILLANCE,
633661
CaseExportType.CASE_MANAGEMENT })
@@ -637,7 +665,7 @@ public QuarantineType getQuarantine() {
637665
return quarantine;
638666
}
639667

640-
@Order(34)
668+
@Order(36)
641669
@ExportTarget(caseExportTypes = {
642670
CaseExportType.CASE_SURVEILLANCE,
643671
CaseExportType.CASE_MANAGEMENT })
@@ -647,7 +675,7 @@ public String getQuarantineTypeDetails() {
647675
return quarantineTypeDetails;
648676
}
649677

650-
@Order(35)
678+
@Order(37)
651679
@ExportTarget(caseExportTypes = {
652680
CaseExportType.CASE_SURVEILLANCE,
653681
CaseExportType.CASE_MANAGEMENT })
@@ -657,7 +685,7 @@ public Date getQuarantineFrom() {
657685
return quarantineFrom;
658686
}
659687

660-
@Order(36)
688+
@Order(38)
661689
@ExportTarget(caseExportTypes = {
662690
CaseExportType.CASE_SURVEILLANCE,
663691
CaseExportType.CASE_MANAGEMENT })
@@ -667,7 +695,7 @@ public Date getQuarantineTo() {
667695
return quarantineTo;
668696
}
669697

670-
@Order(37)
698+
@Order(39)
671699
@ExportTarget(caseExportTypes = {
672700
CaseExportType.CASE_SURVEILLANCE,
673701
CaseExportType.CASE_MANAGEMENT })
@@ -680,7 +708,7 @@ public boolean isQuarantineOrderedVerbally() {
680708
return quarantineOrderedVerbally;
681709
}
682710

683-
@Order(38)
711+
@Order(40)
684712
@ExportTarget(caseExportTypes = {
685713
CaseExportType.CASE_SURVEILLANCE,
686714
CaseExportType.CASE_MANAGEMENT })
@@ -693,7 +721,7 @@ public boolean isQuarantineOrderedOfficialDocument() {
693721
return quarantineOrderedOfficialDocument;
694722
}
695723

696-
@Order(39)
724+
@Order(41)
697725
@ExportTarget(caseExportTypes = {
698726
CaseExportType.CASE_SURVEILLANCE,
699727
CaseExportType.CASE_MANAGEMENT })
@@ -706,7 +734,7 @@ public Date getQuarantineOrderedVerballyDate() {
706734
return quarantineOrderedVerballyDate;
707735
}
708736

709-
@Order(40)
737+
@Order(42)
710738
@ExportTarget(caseExportTypes = {
711739
CaseExportType.CASE_SURVEILLANCE,
712740
CaseExportType.CASE_MANAGEMENT })
@@ -719,7 +747,7 @@ public Date getQuarantineOrderedOfficialDocumentDate() {
719747
return quarantineOrderedOfficialDocumentDate;
720748
}
721749

722-
@Order(41)
750+
@Order(43)
723751
@ExportTarget(caseExportTypes = {
724752
CaseExportType.CASE_SURVEILLANCE,
725753
CaseExportType.CASE_MANAGEMENT })
@@ -732,7 +760,7 @@ public boolean isQuarantineOfficialOrderSent() {
732760
return quarantineOfficialOrderSent;
733761
}
734762

735-
@Order(42)
763+
@Order(44)
736764
@ExportTarget(caseExportTypes = {
737765
CaseExportType.CASE_SURVEILLANCE,
738766
CaseExportType.CASE_MANAGEMENT })
@@ -745,7 +773,7 @@ public Date getQuarantineOfficialOrderSentDate() {
745773
return quarantineOfficialOrderSentDate;
746774
}
747775

748-
@Order(43)
776+
@Order(45)
749777
@ExportTarget(caseExportTypes = {
750778
CaseExportType.CASE_SURVEILLANCE,
751779
CaseExportType.CASE_MANAGEMENT })
@@ -755,7 +783,7 @@ public boolean isQuarantineExtended() {
755783
return quarantineExtended;
756784
}
757785

758-
@Order(44)
786+
@Order(46)
759787
@ExportTarget(caseExportTypes = {
760788
CaseExportType.CASE_SURVEILLANCE,
761789
CaseExportType.CASE_MANAGEMENT })
@@ -765,7 +793,7 @@ public boolean isQuarantineReduced() {
765793
return quarantineReduced;
766794
}
767795

768-
@Order(45)
796+
@Order(47)
769797
@ExportTarget(caseExportTypes = {
770798
CaseExportType.CASE_SURVEILLANCE })
771799
@ExportProperty(MAX_SOURCE_CASE_CLASSIFICATION)
@@ -774,7 +802,7 @@ public CaseClassification getMaxSourceCaseClassification() {
774802
return maxSourceCaseClassification;
775803
}
776804

777-
@Order(46)
805+
@Order(48)
778806
@ExportTarget(caseExportTypes = {
779807
CaseExportType.CASE_SURVEILLANCE })
780808
@ExportProperty(ASSOCIATED_WITH_OUTBREAK)
@@ -787,7 +815,7 @@ public void setMaxSourceCaseClassification(CaseClassification maxSourceCaseClass
787815
this.maxSourceCaseClassification = maxSourceCaseClassification;
788816
}
789817

790-
@Order(47)
818+
@Order(49)
791819
@ExportTarget(caseExportTypes = {
792820
CaseExportType.CASE_SURVEILLANCE,
793821
CaseExportType.CASE_MANAGEMENT })
@@ -797,7 +825,7 @@ public YesNoUnknown getAdmittedToHealthFacility() {
797825
return admittedToHealthFacility;
798826
}
799827

800-
@Order(48)
828+
@Order(50)
801829
@ExportTarget(caseExportTypes = {
802830
CaseExportType.CASE_SURVEILLANCE,
803831
CaseExportType.CASE_MANAGEMENT })
@@ -807,7 +835,7 @@ public Date getAdmissionDate() {
807835
return admissionDate;
808836
}
809837

810-
@Order(49)
838+
@Order(51)
811839
@ExportTarget(caseExportTypes = {
812840
CaseExportType.CASE_SURVEILLANCE,
813841
CaseExportType.CASE_MANAGEMENT })
@@ -821,7 +849,7 @@ public void setDischargeDate(Date dischargeDate) {
821849
this.dischargeDate = dischargeDate;
822850
}
823851

824-
@Order(50)
852+
@Order(52)
825853
@ExportTarget(caseExportTypes = {
826854
CaseExportType.CASE_SURVEILLANCE,
827855
CaseExportType.CASE_MANAGEMENT })
@@ -835,7 +863,7 @@ public void setLeftAgainstAdvice(YesNoUnknown leftAgainstAdvice) {
835863
this.leftAgainstAdvice = leftAgainstAdvice;
836864
}
837865

838-
@Order(51)
866+
@Order(53)
839867
@ExportTarget(caseExportTypes = {
840868
CaseExportType.CASE_SURVEILLANCE,
841869
CaseExportType.CASE_MANAGEMENT })
@@ -845,7 +873,7 @@ public PresentCondition getPresentCondition() {
845873
return presentCondition;
846874
}
847875

848-
@Order(52)
876+
@Order(54)
849877
@ExportTarget(caseExportTypes = {
850878
CaseExportType.CASE_SURVEILLANCE })
851879
@ExportProperty(PersonDto.DEATH_DATE)
@@ -854,7 +882,7 @@ public Date getDeathDate() {
854882
return deathDate;
855883
}
856884

857-
@Order(53)
885+
@Order(55)
858886
@ExportTarget(caseExportTypes = {
859887
CaseExportType.CASE_SURVEILLANCE })
860888
@ExportProperty(BURIAL_INFO)

‎sormas-api/src/main/resources/enum.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1222,7 +1222,7 @@ EndOfQuarantineReason.OTHER=Other
12221222

12231223
#InfectionSetting
12241224
InfectionSetting.UNKNOWN=Unknown
1225-
InfectionSetting.AMBULANT=Ambulatory
1225+
InfectionSetting.AMBULATORY=Ambulatory
12261226
InfectionSetting.MEDICAL_PRACTICE=Medical practice
12271227
InfectionSetting.OPERATIVE_1200=Operative
12281228
InfectionSetting.HOSPITAL_1300=Hospital

‎sormas-api/src/main/resources/enum_de-DE.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,7 @@ EndOfQuarantineReason.OTHER=Sonstiges
12171217

12181218
#InfectionSetting
12191219
InfectionSetting.UNKNOWN=Nicht erhoben
1220-
InfectionSetting.AMBULANT=Ambulant
1220+
InfectionSetting.AMBULATORY=Ambulant
12211221
InfectionSetting.MEDICAL_PRACTICE=Arztpraxis
12221222
InfectionSetting.OPERATIVE_1200=Operativ
12231223
InfectionSetting.HOSPITAL_1300=Krankenhaus

‎sormas-backend/src/main/java/de/symeda/sormas/backend/caze/Case.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ public class Case extends CoreAdo {
150150
public static final String ADDITIONAL_DETAILS = "additionalDetails";
151151
public static final String EXTERNAL_ID = "externalID";
152152
public static final String SHARED_TO_COUNTRY = "sharedToCountry";
153+
public static final String NOSOCOMIAL_OUTBREAK = "nosocomialOutbreak";
154+
public static final String INFECTION_SETTING = "infectionSetting";
153155
public static final String QUARANTINE = "quarantine";
154156
public static final String QUARANTINE_TYPE_DETAILS = "quarantineTypeDetails";
155157
public static final String QUARANTINE_FROM = "quarantineFrom";

‎sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ public List<CaseExportDto> getExportList(
543543
joins.getPointOfEntry().get(PointOfEntry.NAME), joins.getPointOfEntry().get(PointOfEntry.UUID), caseRoot.get(Case.POINT_OF_ENTRY_DETAILS),
544544
caseRoot.get(Case.CASE_CLASSIFICATION), caseRoot.get(Case.INVESTIGATION_STATUS), caseRoot.get(Case.OUTCOME),
545545
caseRoot.get(Case.FOLLOW_UP_STATUS), caseRoot.get(Case.FOLLOW_UP_UNTIL),
546+
caseRoot.get(Case.NOSOCOMIAL_OUTBREAK), caseRoot.get(Case.INFECTION_SETTING),
546547
// quarantine
547548
caseRoot.get(Case.QUARANTINE), caseRoot.get(Case.QUARANTINE_TYPE_DETAILS), caseRoot.get(Case.QUARANTINE_FROM), caseRoot.get(Case.QUARANTINE_TO),
548549
caseRoot.get(Case.QUARANTINE_ORDERED_VERBALLY),

0 commit comments

Comments
 (0)