diff --git a/internal/domain/main-entities/mcu-order-sub-item/base/entity.go b/internal/domain/main-entities/mcu-order-sub-item/base/entity.go
new file mode 100644
index 00000000..fea105a4
--- /dev/null
+++ b/internal/domain/main-entities/mcu-order-sub-item/base/entity.go
@@ -0,0 +1,17 @@
+package mcuordersubitem
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+	emss "simrs-vx/internal/domain/main-entities/mcu-sub-src"
+
+	erc "simrs-vx/internal/domain/references/common"
+)
+
+type McuOrderSubItem struct {
+	ecore.Main                         // adjust this according to the needs
+	McuSubSrc_Code  *string            `json:"mcuSubSrc_code" gorm:"uniqueIndex:idx_order_sub_src"`
+	McuSubSrc       *emss.McuSubSrc    `json:"mcuSubSrc,omitempty" gorm:"foreignKey:McuSubSrc_Code;references:Code"`
+	McuOrderItem_Id *uint              `json:"mcuOrderItem_id" gorm:"uniqueIndex:idx_order_sub_src"`
+	Result          *string            `json:"result"`
+	Status_Code     erc.DataStatusCode `json:"status_code"`
+}
diff --git a/internal/domain/main-entities/mcu-order-sub-item/entity.go b/internal/domain/main-entities/mcu-order-sub-item/entity.go
index a9bde496..990cd048 100644
--- a/internal/domain/main-entities/mcu-order-sub-item/entity.go
+++ b/internal/domain/main-entities/mcu-order-sub-item/entity.go
@@ -3,19 +3,15 @@ package mcuordersubitem
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
 	emoi "simrs-vx/internal/domain/main-entities/mcu-order-item"
-	emss "simrs-vx/internal/domain/main-entities/mcu-sub-src"
 
+	eb "simrs-vx/internal/domain/main-entities/mcu-order-sub-item/base"
 	erc "simrs-vx/internal/domain/references/common"
 )
 
 type McuOrderSubItem struct {
-	ecore.Main                         // adjust this according to the needs
-	McuSubSrc_Code  *string            `json:"mcuSubSrc_code" gorm:"uniqueIndex:idx_order_sub_src"`
-	McuSubSrc       *emss.McuSubSrc    `json:"mcuSubSrc,omitempty" gorm:"foreignKey:McuSubSrc_Code;references:Code"`
-	McuOrderItem_Id *uint              `json:"mcuOrderItem_id" gorm:"uniqueIndex:idx_order_sub_src"`
-	McuOrderItem    *emoi.McuOrderItem `json:"mcuOrderItem,omitempty" gorm:"foreignKey:McuOrderItem_Id;references:Id"`
-	Result          *string            `json:"result"`
-	Status_Code     erc.DataStatusCode `json:"status_code"`
+	ecore.Main // adjust this according to the needs
+	eb.McuOrderSubItem
+	McuOrderItem *emoi.McuOrderItem `json:"mcuOrderItem,omitempty" gorm:"foreignKey:McuOrderItem_Id;references:Id"`
 }
 
 func (d McuOrderSubItem) IsCompleted() bool {
diff --git a/internal/domain/main-entities/mcu-src-category/dto.go b/internal/domain/main-entities/mcu-src-category/dto.go
index f9bb7d00..e1ef57d9 100644
--- a/internal/domain/main-entities/mcu-src-category/dto.go
+++ b/internal/domain/main-entities/mcu-src-category/dto.go
@@ -1,4 +1,4 @@
-package division
+package mcusrccategory
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
@@ -20,10 +20,10 @@ type ReadListDto struct {
 }
 
 type FilterDto struct {
-	Code       string            `json:"code"`
-	Name       string            `json:"name"`
-	Scope_Code *erc.McuScopeCode `json:"scope-code"`
-	Search     string            `json:"search" gormhelper:"searchColumns=Code,Name"`
+	Code       *string `json:"code"`
+	Name       *string `json:"name"`
+	Scope_Code *string `json:"scope-code"`
+	Search     string  `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {
diff --git a/internal/domain/main-entities/mcu-src-category/entity.go b/internal/domain/main-entities/mcu-src-category/entity.go
index 8fc801b9..2175552c 100644
--- a/internal/domain/main-entities/mcu-src-category/entity.go
+++ b/internal/domain/main-entities/mcu-src-category/entity.go
@@ -1,4 +1,4 @@
-package division
+package mcusrccategory
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
diff --git a/internal/domain/references/clinical/clinical.go b/internal/domain/references/clinical/clinical.go
index 7a3a2ec1..43305a99 100644
--- a/internal/domain/references/clinical/clinical.go
+++ b/internal/domain/references/clinical/clinical.go
@@ -196,8 +196,12 @@ const (
 	TSCTeam   TranslatorSrcCode = "team"   // Tim Penerjemah
 	TSCFamily TranslatorSrcCode = "family" // Keluarga
 
-	SFTCA ScreeningFormTypeCode = "form-a" // Formu A
-	SFTCB ScreeningFormTypeCode = "form-b" // Formu B
+	SFTCA        ScreeningFormTypeCode = "form-a" // Formu A
+	SFTCB        ScreeningFormTypeCode = "form-b" // Formu B
+	MSCRadiology McuScopeCode          = "radiology"
+	MSCCpLab     McuScopeCode          = "cp-lab"
+	MSCMicroLab  McuScopeCode          = "micro-lab"
+	MSCApLab     McuScopeCode          = "ap-lab"
 
 	SSCSmall   SurgerySizeCode = ""
 	SSCMedium  SurgerySizeCode = ""