From 4f6bc8da314809802b07305f851c8e2ebd59f12f Mon Sep 17 00:00:00 2001
From: Munawwirul Jamal <munawwirul.jamal@gmail.com>
Date: Mon, 1 Dec 2025 18:02:20 +0700
Subject: [PATCH] feat/action-report: migrated + finishing

---
 cmd/main-migration/migrations/atlas.sum                | 7 ++-----
 internal/domain/main-entities/mcu-order-item/entity.go | 4 +++-
 internal/domain/references/clinical/clinical.go        | 6 ------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/cmd/main-migration/migrations/atlas.sum b/cmd/main-migration/migrations/atlas.sum
index bdc2efaf..8f71fcc5 100644
--- a/cmd/main-migration/migrations/atlas.sum
+++ b/cmd/main-migration/migrations/atlas.sum
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-h1:oIkzjGilKCqqfLGlvMc2I2WwJ8zQgdMeTWy25k1uaLI=
-=======
-h1:fkwkWe2PSYaTNxdTEmwe747+bhXV+kOcly/gC7dq/Q8=
->>>>>>> migration
+h1:NUsCmkoiBso9yZsv4HWrn3+woqMcFRFtgXKln5rY4pQ=
 20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k=
 20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0=
 20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI=
@@ -136,3 +132,4 @@ h1:fkwkWe2PSYaTNxdTEmwe747+bhXV+kOcly/gC7dq/Q8=
 20251125125303.sql h1:4JSFv1Pmhbe9tqpLXgO63OwYnGsalStgUXKVWPyc1YE=
 20251126064057.sql h1:vAdhz5Nn/gGJy0UKZAEldeXv8HpHtJU/t8ygDVIbTsU=
 20251201081333.sql h1:PoC8ADRdwDuohDTB74yW/DaB42igdYa4B6humbrEJBk=
+20251201104439.sql h1:tpqdrOf9d2aGwZshqm62nG6SXnfVaO/g6A7z0efPS14=
diff --git a/internal/domain/main-entities/mcu-order-item/entity.go b/internal/domain/main-entities/mcu-order-item/entity.go
index 48a57bac..7d4d757d 100644
--- a/internal/domain/main-entities/mcu-order-item/entity.go
+++ b/internal/domain/main-entities/mcu-order-item/entity.go
@@ -4,12 +4,14 @@ import (
 	emo "simrs-vx/internal/domain/main-entities/mcu-order"
 	emoib "simrs-vx/internal/domain/main-entities/mcu-order-item/base"
 
+	emosi "simrs-vx/internal/domain/main-entities/mcu-order-sub-item/base"
 	erc "simrs-vx/internal/domain/references/common"
 )
 
 type McuOrderItem struct {
 	emoib.McuOrderItem
-	McuOrder *emo.McuOrder `json:"mcuOrder,omitempty" gorm:"foreignKey:McuOrder_Id;references:Id"`
+	McuOrder *emo.McuOrder            `json:"mcuOrder,omitempty" gorm:"foreignKey:McuOrder_Id;references:Id"`
+	Items    []*emosi.McuOrderSubItem `json:"items" gorm:"foreignKey:McuOrderItem_Id;references:Id"`
 }
 
 func (d McuOrderItem) IsCompleted() bool {
diff --git a/internal/domain/references/clinical/clinical.go b/internal/domain/references/clinical/clinical.go
index f6c1b572..7a3a2ec1 100644
--- a/internal/domain/references/clinical/clinical.go
+++ b/internal/domain/references/clinical/clinical.go
@@ -23,7 +23,6 @@ type (
 	LangClassCode         string
 	TranslatorSrcCode     string
 	ScreeningFormTypeCode string
-<<<<<<< HEAD
 	SurgerySizeCode       string
 	SurgerySystemCode     string
 	SurgeryTypeCode       string
@@ -31,8 +30,6 @@ type (
 	BornMortalityCode     string
 	BornLocationCode      string
 	SpecimentDestCode     string
-=======
->>>>>>> migration
 )
 
 const (
@@ -201,7 +198,6 @@ const (
 
 	SFTCA ScreeningFormTypeCode = "form-a" // Formu A
 	SFTCB ScreeningFormTypeCode = "form-b" // Formu B
-<<<<<<< HEAD
 
 	SSCSmall   SurgerySizeCode = ""
 	SSCMedium  SurgerySizeCode = ""
@@ -234,8 +230,6 @@ const (
 	SDCMicro SpecimentDestCode = ""
 	SDCLab   SpecimentDestCode = ""
 	SDCNone  SpecimentDestCode = ""
-=======
->>>>>>> migration
 )
 
 type Soapi struct {