@@ -71,7 +71,8 @@ public abstract class AbstractCaseView extends AbstractEditAllowedDetailView<Cas
7171 Disease .INVASIVE_MENINGOCOCCAL_INFECTION ,
7272 Disease .INVASIVE_PNEUMOCOCCAL_INFECTION ,
7373 Disease .GIARDIASIS ,
74- Disease .CRYPTOSPORIDIOSIS )));
74+ Disease .CRYPTOSPORIDIOSIS ,
75+ Disease .LATENT_TUBERCULOSIS )));
7576
7677 public static final Set <Disease > NON_LUX_CLINICAL_COURSE_DISABLED_DISEASES =
7778 Collections .unmodifiableSet (new HashSet <>(Arrays .asList (Disease .LATENT_TUBERCULOSIS , Disease .INFLUENZA )));
@@ -91,6 +92,7 @@ public abstract class AbstractCaseView extends AbstractEditAllowedDetailView<Cas
9192 private final boolean redirectSimpleModeToCaseDataView ;
9293 private final OptionGroup viewModeToggle ;
9394 private final Property .ValueChangeListener viewModeToggleListener ;
95+ boolean isLuxembourg = FacadeProvider .getConfigFacade ().isConfiguredCountry (CountryHelper .COUNTRY_CODE_LUXEMBOURG );
9496
9597 protected AbstractCaseView (String viewName , boolean redirectSimpleModeToCaseDataView ) {
9698 super (viewName );
@@ -229,16 +231,14 @@ public void refreshMenu(SubMenu menu, String params) {
229231 }
230232
231233 if (showExtraMenuEntries ) {
234+ // Clinical course is disabled for Luxembourg for Measles, IMI, IPI, GIARDIASIS, Cryptosporidiosis cases,
235+ // and for all other countries Influenza cases. #13708 and LTB. #14038
236+ boolean isDiseaseDisabled = isLuxembourg
237+ ? CLINICAL_COURSE_DISABLED_DISEASES .contains (caze .getDisease ())
238+ : NON_LUX_CLINICAL_COURSE_DISABLED_DISEASES .contains (caze .getDisease ());
232239 if (UiUtil .permitted (
233240 EnumSet .of (FeatureType .VIEW_TAB_CASES_FOLLOW_UP , FeatureType .VIEW_TAB_CASES_CLINICAL_COURSE , FeatureType .CLINICAL_MANAGEMENT ),
234- UserRight .CLINICAL_COURSE_VIEW )
235- && !caze .checkIsUnreferredPortHealthCase ()
236- && !(FacadeProvider .getConfigFacade ().isConfiguredCountry (CountryHelper .COUNTRY_CODE_LUXEMBOURG )
237- && CLINICAL_COURSE_DISABLED_DISEASES .contains (caze .getDisease ()))
238- && !NON_LUX_CLINICAL_COURSE_DISABLED_DISEASES .contains (caze .getDisease ())) {
239- // clinical course view is not available for Luxembourg for Measles, IMI, IPI, GIARDIASIS, Cryptosporidiosis cases,
240- // and for all other countries Influenza cases. #13708
241- // clinical course view is not available for all countries LTB and Influenza.#14038
241+ UserRight .CLINICAL_COURSE_VIEW ) && !caze .checkIsUnreferredPortHealthCase () && !isDiseaseDisabled ) {
242242 menu .addView (
243243 ClinicalCourseView .VIEW_NAME ,
244244 I18nProperties .getPrefixCaption (CaseDataDto .I18N_PREFIX , CaseDataDto .CLINICAL_COURSE ),
0 commit comments