Skip to content

Commit 0cd7630

Browse files
obinna-h-nobinna-h-n
authored
Merge pull request #13571 from SORMAS-Foundation/TB-review-result-updates
tb review result updates
2 parents acfe63d + 6e9b0b3 commit 0cd7630

File tree

18 files changed

+326
-115
lines changed

18 files changed

+326
-115
lines changed

‎sormas-api/src/main/java/de/symeda/sormas/api/hospitalization/HospitalizationDto.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
*******************************************************************************/
1818
package de.symeda.sormas.api.hospitalization;
1919

20-
import de.symeda.sormas.api.feature.FeatureType;
21-
import de.symeda.sormas.api.utils.DependingOnFeatureType;
2220
import java.util.ArrayList;
2321
import java.util.Date;
2422
import java.util.List;
@@ -28,8 +26,10 @@
2826

2927
import de.symeda.sormas.api.EntityDto;
3028
import de.symeda.sormas.api.ImportIgnore;
29+
import de.symeda.sormas.api.feature.FeatureType;
3130
import de.symeda.sormas.api.i18n.Validations;
3231
import de.symeda.sormas.api.utils.DataHelper;
32+
import de.symeda.sormas.api.utils.DependingOnFeatureType;
3333
import de.symeda.sormas.api.utils.FieldConstraints;
3434
import de.symeda.sormas.api.utils.Outbreaks;
3535
import de.symeda.sormas.api.utils.YesNoUnknown;
@@ -55,6 +55,7 @@ public class HospitalizationDto extends EntityDto {
5555
public static final String HOSPITALIZATION_REASON = "hospitalizationReason";
5656
public static final String OTHER_HOSPITALIZATION_REASON = "otherHospitalizationReason";
5757
public static final String DESCRIPTION = "description";
58+
public static final String CURRENTLY_HOSPITALIZED = "currentlyHospitalized";
5859

5960
// Fields are declared in the order they should appear in the import template
6061

@@ -77,6 +78,7 @@ public class HospitalizationDto extends EntityDto {
7778
private String otherHospitalizationReason;
7879
@Size(max = FieldConstraints.CHARACTER_LIMIT_BIG, message = Validations.textTooLong)
7980
private String description;
81+
private YesNoUnknown currentlyHospitalized;
8082

8183
public static HospitalizationDto build() {
8284
HospitalizationDto hospitalization = new HospitalizationDto();
@@ -197,4 +199,12 @@ public String getDescription() {
197199
public void setDescription(String description) {
198200
this.description = description;
199201
}
202+
203+
public YesNoUnknown getCurrentlyHospitalized() {
204+
return currentlyHospitalized;
205+
}
206+
207+
public void setCurrentlyHospitalized(YesNoUnknown currentlyHospitalized) {
208+
this.currentlyHospitalized = currentlyHospitalized;
209+
}
200210
}

‎sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,7 @@ public interface Captions {
890890
String CaseHospitalization = "CaseHospitalization";
891891
String CaseHospitalization_admissionDate = "CaseHospitalization.admissionDate";
892892
String CaseHospitalization_admittedToHealthFacility = "CaseHospitalization.admittedToHealthFacility";
893+
String CaseHospitalization_currentlyHospitalized = "CaseHospitalization.currentlyHospitalized";
893894
String CaseHospitalization_dischargeDate = "CaseHospitalization.dischargeDate";
894895
String CaseHospitalization_healthFacility = "CaseHospitalization.healthFacility";
895896
String CaseHospitalization_hospitalizationReason = "CaseHospitalization.hospitalizationReason";

‎sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1878,6 +1878,7 @@ public interface Strings {
18781878
String setTo = "setTo";
18791879
String sormasToSormasLoadingShares = "sormasToSormasLoadingShares";
18801880
String step = "step";
1881+
String subheadingDiagnosisCriteria = "subheadingDiagnosisCriteria";
18811882
String text = "text";
18821883
String toCase = "toCase";
18831884
String total = "total";

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,7 @@ CaseHospitalization.intensiveCareUnitStart=Start of the stay
643643
CaseHospitalization.intensiveCareUnitEnd=End of the stay
644644
CaseHospitalization.hospitalizationReason=Reason for hospitalization
645645
CaseHospitalization.otherHospitalizationReason=Specify reason
646+
CaseHospitalization.currentlyHospitalized=Currently hospitalized?
646647
# CaseImport
647648
caseImportErrorDescription=Error description
648649
caseImportMergeCase=Override existing case with changes from the imported case?

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2649,7 +2649,7 @@ RadiographyCompatibility.NOT_COMPATIBLE_WITH_TB = Not compatible with TB regardl
26492649

26502650
# ClinicalPresentationStatus
26512651
ClinicalPresentationStatus.ASYMPTOMATIC=Asymtomatic
2652-
ClinicalPresentationStatus.COMPATIBLE=Signs and symptoms compatible regardless of the anatomical site
2652+
ClinicalPresentationStatus.COMPATIBLE=Compatible with %s regardless of the anatomical site
26532653
ClinicalPresentationStatus.UNKNOWN=Unknown
26542654

26552655
# InfectionSite

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -932,6 +932,7 @@ headingImportSurveyTokens = Import Survey Tokens
932932
headingImportSurveyTokenResponses = Import Survey Token Responses
933933
headingDrugSusceptibility = Drug Susceptibility
934934
headingDiagnosisCriteria = Diagnosis Criteria
935+
subheadingDiagnosisCriteria = Note: Diagnosis criteria information is gotten from pathogen testing details
935936
headingGisDashboardMap=Combined status map
936937
headingLocalisation=Localisation
937938

‎sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,11 +222,13 @@ public void deleteSystemEvents() {
222222
}
223223
}
224224

225-
@Schedule(hour = "1", minute = "35", second = "0", persistent = false)
225+
@Schedule(hour = "*", minute = "*", second = "0", persistent = false)
226226
public void fetchExternalMessages() {
227227
if (featureConfigurationFacade.isFeatureEnabled(FeatureType.EXTERNAL_MESSAGES)) {
228228
externalMessageFacade.fetchAndSaveExternalMessages(null);
229+
logger.info("externalMessageFacade.fetchAndSaveExternalMessages completed");
229230
}
231+
logger.info("cron.fetchExternalMessages completed");
230232
}
231233

232234
@Schedule(hour = "1", minute = "40", second = "0", persistent = false)

‎sormas-backend/src/main/java/de/symeda/sormas/backend/hospitalization/Hospitalization.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public class Hospitalization extends AbstractDomainObject {
7272
private HospitalizationReasonType hospitalizationReason;
7373
private String otherHospitalizationReason;
7474
private String description;
75+
private YesNoUnknown currentlyHospitalized;
7576

7677
@Temporal(TemporalType.TIMESTAMP)
7778
public Date getAdmissionDate() {
@@ -210,4 +211,13 @@ public String getDescription() {
210211
public void setDescription(String description) {
211212
this.description = description;
212213
}
214+
215+
@Enumerated(EnumType.STRING)
216+
public YesNoUnknown getCurrentlyHospitalized() {
217+
return currentlyHospitalized;
218+
}
219+
220+
public void setCurrentlyHospitalized(YesNoUnknown currentlyHospitalized) {
221+
this.currentlyHospitalized = currentlyHospitalized;
222+
}
213223
}

‎sormas-backend/src/main/java/de/symeda/sormas/backend/hospitalization/HospitalizationFacadeEjb.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ public Hospitalization fillOrBuildEntity(HospitalizationDto source, Hospitalizat
8888
target.setIntensiveCareUnitStart(source.getIntensiveCareUnitStart());
8989
target.setIntensiveCareUnitEnd(source.getIntensiveCareUnitEnd());
9090
target.setDescription(source.getDescription());
91+
target.setCurrentlyHospitalized(source.getCurrentlyHospitalized());
9192

9293
return target;
9394
}
@@ -156,6 +157,7 @@ public static HospitalizationDto toDto(Hospitalization hospitalization) {
156157
target.setIntensiveCareUnitStart(source.getIntensiveCareUnitStart());
157158
target.setIntensiveCareUnitEnd(source.getIntensiveCareUnitEnd());
158159
target.setDescription(source.getDescription());
160+
target.setCurrentlyHospitalized(source.getCurrentlyHospitalized());
159161

160162
return target;
161163
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14416,4 +14416,9 @@ alter table drugsusceptibility_history add column IF NOT EXISTS erythromycinSusc
1441614416

1441714417
INSERT INTO schema_version (version_number, comment) VALUES (578, 'Update history tables #13516');
1441814418

14419+
alter table hospitalization add currentlyhospitalized varchar(255);
14420+
alter table hospitalization_history add currentlyhospitalized varchar(255);
14421+
14422+
INSERT INTO schema_version (version_number, comment) VALUES (579, 'Add currently hospitalized to hospitalization #13321');
14423+
1441914424
-- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. ***

0 commit comments

Comments
 (0)