Merge branch 'development' into bugfix-13734-add-therapy-and-clinical-course-tabs-visibility

Author: KarnaiahPesula

sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/processing/doctordeclaration/AbstractDoctorDeclarationMessageProcessingFlow.java

@@ -373,41 +373,22 @@ protected void postBuildHospitalization(CaseDataDto caseDto, ExternalMessageDto
 
 		final FacilityReferenceDto hospitalFacilityReference = getHospitalFacilityReference(externalMessageDto);
 
-		if (externalMessageDto.getAdmittedToHealthFacility() == null
-			&& externalMessageDto.getHospitalizationFacilityName() == null
+		if (externalMessageDto.getHospitalizationFacilityName() == null
 			&& externalMessageDto.getHospitalizationFacilityExternalId() == null
-			&& externalMessageDto.getHospitalizationFacilityDepartment() == null
-			&& externalMessageDto.getHospitalizationAdmissionDate() == null
-			&& externalMessageDto.getHospitalizationDischargeDate() == null) {
+			&& externalMessageDto.getHospitalizationFacilityDepartment() == null) {
 			logger.info("[POST BUILD HOSPITALIZATION] No hospitalization information found for case with UUID: {}.", caseDto.getUuid());
 			return;
 		}
 
-		// If we do not have a hospital facility reference, we quit early
-		if (hospitalFacilityReference == null) {
-			logger.warn(
-				"[POST BUILD HOSPITALIZATION] No hospital facility found for case with UUID: {}. Hospitalization details will not be set.",
-				caseDto.getUuid());
-			return;
-		}
-
 		HospitalizationDto hospitalizationDto = caseDto.getHospitalization();
 		if (hospitalizationDto == null) {
 			hospitalizationDto = HospitalizationDto.build();
 			caseDto.setHospitalization(hospitalizationDto);
 			logger.debug("[POST BUILD HOSPITALIZATION] Hospitalization initialized for case with UUID: {}", caseDto.getUuid());
 		}
 
-		final FacilityDto hospitalFacility = getExternalMessageProcessingFacade().getFacilityByUuid(hospitalFacilityReference.getUuid());
-
-		// if for whatever reason the hospital facility is not found, we quit early
-		if (hospitalFacility == null) {
-			logger.warn(
-				"[POST BUILD HOSPITALIZATION] Hospital facility with UUID: {} not found for case with UUID: {}. Hospitalization details will not be set.",
-				hospitalFacilityReference.getUuid(),
-				caseDto.getUuid());
-			return;
-		}
+		final FacilityDto hospitalFacility =
+			hospitalFacilityReference != null ? getExternalMessageProcessingFacade().getFacilityByUuid(hospitalFacilityReference.getUuid()) : null;
 
 		// In case the patient is admitted to a health facility, we need to set the case hospitalization details and quit early
 		if (YesNoUnknown.YES.equals(externalMessageDto.getAdmittedToHealthFacility())) {
@@ -424,27 +405,42 @@ protected void postBuildHospitalization(CaseDataDto caseDto, ExternalMessageDto
 				hospitalizationDto.setCurrentlyHospitalized(YesNoUnknown.YES);
 			}
 
+			caseDto.setDepartment(externalMessageDto.getHospitalizationFacilityDepartment());
+			caseDto.setFacilityType(FacilityType.HOSPITAL);
+
+			// if for whatever reason the hospital facility is not found, we quit early
+			if (hospitalFacility == null) {
+				logger.warn(
+					"[POST BUILD HOSPITALIZATION] Hospital facility not found for case with UUID: {}. Hospitalization details will not be set.",
+					caseDto.getUuid());
+				return;
+			}
+			
+			// we have a facility, so we set the responsible region, district and community
 			caseDto.setResponsibleRegion(hospitalFacility.getRegion());
 			caseDto.setResponsibleDistrict(hospitalFacility.getDistrict());
 			caseDto.setResponsibleCommunity(hospitalFacility.getCommunity());
 			caseDto.setHealthFacility(hospitalFacilityReference);
-			caseDto.setDepartment(externalMessageDto.getHospitalizationFacilityDepartment());
-			caseDto.setFacilityType(FacilityType.HOSPITAL);
+
 			return;
 		}
 
 		// the patient is not admitted to a health facility, so we create a previous hospitalization entry
 		final PreviousHospitalizationDto previousHospitalization = new PreviousHospitalizationDto();
 		previousHospitalization.setUuid(DataHelper.createUuid());
 
-		previousHospitalization.setAdmittedToHealthFacility(externalMessageDto.getAdmittedToHealthFacility());
+		// Here we set the admitted to health facility to yes, because currently he is not admitted to a health facility thus meaning that this is a previous hospitalization
+		previousHospitalization.setAdmittedToHealthFacility(YesNoUnknown.YES);
 		previousHospitalization.setAdmissionDate(externalMessageDto.getHospitalizationAdmissionDate());
 		previousHospitalization.setDischargeDate(externalMessageDto.getHospitalizationDischargeDate());
 
-		previousHospitalization.setRegion(hospitalFacility.getRegion());
-		previousHospitalization.setDistrict(hospitalFacility.getDistrict());
-		previousHospitalization.setCommunity(hospitalFacility.getCommunity());
-		previousHospitalization.setHealthFacility(hospitalFacilityReference);
+		if (hospitalFacility != null) {
+			previousHospitalization.setRegion(hospitalFacility.getRegion());
+			previousHospitalization.setDistrict(hospitalFacility.getDistrict());
+			previousHospitalization.setCommunity(hospitalFacility.getCommunity());
+			previousHospitalization.setHealthFacility(hospitalFacilityReference);
+		}
+
 		previousHospitalization.setHealthFacilityDepartment(externalMessageDto.getHospitalizationFacilityDepartment());
 
 		if (hospitalizationDto.getPreviousHospitalizations() == null) {
@@ -464,18 +460,7 @@ protected void postBuildHospitalization(CaseDataDto caseDto, ExternalMessageDto
 	 */
 	@Override
 	protected void postBuildPerson(PersonDto personDto, ExternalMessageDto externalMessageDto) {
-
-		logger.debug("[POST BUILD PERSON] Processing person with UUID: {}", personDto.getUuid());
-
-		if (externalMessageDto.getPersonGuardianFirstName() != null && externalMessageDto.getPersonGuardianLastName() != null) {
-			personDto.setNamesOfGuardians(externalMessageDto.getPersonGuardianFirstName() + " " + externalMessageDto.getPersonGuardianLastName());
-
-			logger.debug(
-				"[POST BUILD PERSON] Guardian names set for person with UUID: {} - Guardian: {} {}",
-				personDto.getUuid(),
-				externalMessageDto.getPersonGuardianFirstName(),
-				externalMessageDto.getPersonGuardianLastName());
-		}
+		// No additional actions needed for person data
 	}
 
 	/**

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

@@ -1035,6 +1035,8 @@ public interface Strings {
 	String infoExposureInvestigationContacts = "infoExposureInvestigationContacts";
 	String infoExposuresInfectionEnvironmentHint = "infoExposuresInfectionEnvironmentHint";
 	String infoExposuresRiskAreaHint = "infoExposuresRiskAreaHint";
+	String infoExternalMessageHospitalizationFacilityMissing = "infoExternalMessageHospitalizationFacilityMissing";
+	String infoExternalMessageHospitalizationMissingHospital = "infoExternalMessageHospitalizationMissingHospital";
 	String infoFacilityCsvImport = "infoFacilityCsvImport";
 	String infoFacilityNeedsDistrict = "infoFacilityNeedsDistrict";
 	String infoHeadingAefiDashboardMap = "infoHeadingAefiDashboardMap";

sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomsDto.java

@@ -2649,6 +2649,7 @@ public static SymptomsDto build() {
 	private String otherClinicalPresentationText;
 
 	@Diseases({
+		PERTUSSIS,
 		INVASIVE_PNEUMOCOCCAL_INFECTION,
 		INVASIVE_MENINGOCOCCAL_INFECTION,
 		MEASLES })

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

@@ -1155,6 +1155,8 @@ infoNoSurveys=There are no surveys created or sent for this case
 infoSurveyResponseReceived=Response received
 infoSurveyResponseNotReceived=No response received yet
 infoNoDiseaseConfigurationAgeGroups=Click on the + button below to add age groups to this disease configuration.
+infoExternalMessageHospitalizationFacilityMissing=The external message contains a hospitalization entry without a hospital name.\nThe processing can continue but the hospital facility will not be set.
+infoExternalMessageHospitalizationMissingHospital=Hospital facility missing for hospital '%s'.\nPlease contact your system administrator to configure the hospital facility.
 
 # Messages
 messageActionOutsideJurisdictionDeletionDenied = The action outside user's jurisdiction cannot be deleted

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java

@@ -190,7 +190,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 	public static final String DATABASE_NAME = "sormas.db";
 	// any time you make changes to your database objects, you may have to increase the database version
 
-	public static final int DATABASE_VERSION = 359;
+	public static final int DATABASE_VERSION = 360;
 
 	private static DatabaseHelper instance = null;
 
@@ -398,7 +398,7 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 		// IMPORTANT: table and column names are CASE SENSITIVE!
 		int currentVersion = oldVersion;
 		try {
-			switch (oldVersion) {
+			switch (newVersion) {
 			case 91:
 				currentVersion = 91;
 				getDao(District.class).executeRaw("ALTER TABLE district ADD COLUMN epidCode varchar(255);");
@@ -3201,8 +3201,28 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 				getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN septicaemia varchar(255);");
 				getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN whoopsound varchar(255);");
 
-				// ATTENTION: break should only be done after last version
-				break;
+            case 360:
+				currentVersion = 360;
+                getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN acuteEncephalitis varchar(255);");
+                getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN eggyBurps varchar(255);");
+                getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN weightLoss varchar(255);");
+                getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN weightLossAmount float8;");
+                getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN reoccurrence varchar(255);");
+                getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN symptomCurrentStatus varchar(255);");
+                getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN durationOfSymptoms int;");
+                getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN overnightStayRequired varchar(255);");
+                getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN bloating varchar(255);");
+                getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN difficultyBreathingDuringMeals varchar(255);");
+                getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN paradoxicalBreathing varchar(255);");
+                getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN respiratoryFatigue varchar(255);");
+                getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN parentTimeOffWork varchar(255);");
+                getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN timeOffWorkDays float8;");
+                getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN unknownSymptom varchar(255);");
+                getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN skinRashOnsetDate timestamp;");
+
+
+                // ATTENTION: break should only be done after last version
+                break;
 
 
 

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/contact/ContactDao.java

@@ -219,7 +219,19 @@ private QueryBuilder<Contact, Long> buildQueryBuilder(ContactCriteria contactCri
 
 		// Only use user filter if no restricting case is specified
 		if (contactCriteria.getIncludeContactsFromOtherJurisdictions().equals(false)) {
-			whereStatements.add(where.or(createJurisdictionFilterForCase(where), createJurisdictionFilter(where)));
+//			whereStatements.add(where.or(createJurisdictionFilterForCase(where), createJurisdictionFilter(where)));
+            Where<Contact, Long> caseJurisdictionWhere = createJurisdictionFilterForCase(where);
+            Where<Contact, Long> jurisdictionWhere = createJurisdictionFilter(where);
+            if (caseJurisdictionWhere != null && jurisdictionWhere != null) {
+                whereStatements.add(where.or(caseJurisdictionWhere, jurisdictionWhere));
+            } else {
+                if (caseJurisdictionWhere != null) {
+                    whereStatements.add(caseJurisdictionWhere);
+                }
+                if (jurisdictionWhere != null) {
+                    whereStatements.add(jurisdictionWhere);
+                }
+            }
 		}
 
 		if (contactCriteria != null) {
@@ -283,8 +295,9 @@ public Where<Contact, Long> createJurisdictionFilterForCase(Where<Contact, Long>
 
 		if (!whereJurisdictionFilterStatements.isEmpty()) {
 			where.or(whereJurisdictionFilterStatements.size());
+            return where;
 		}
-		return where;
+		return null;
 	}
 
 	public Where<Contact, Long> createJurisdictionFilter(Where<Contact, Long> where) throws SQLException {
@@ -316,9 +329,10 @@ public Where<Contact, Long> createJurisdictionFilter(Where<Contact, Long> where)
 
 		if (!whereUserFilterStatements.isEmpty()) {
 			where.or(whereUserFilterStatements.size());
+            return where;
 		}
 
-		return where;
+		return null;
 	}
 
 	public Where<Contact, Long> createCriteriaFilter(List<Where<Contact, Long>> whereStatements, Where<Contact, Long> where, ContactCriteria criteria)