diff --git a/internal/domain/references/clinical/clinical.go b/internal/domain/references/clinical/clinical.go
index 30a4fe8a..25619eab 100644
--- a/internal/domain/references/clinical/clinical.go
+++ b/internal/domain/references/clinical/clinical.go
@@ -311,3 +311,34 @@ type HeadToToe struct {
 	Neuron      string `json:"neuron,omitempty"`
 	BodyOthers  string `json:"body-others,omitempty"`
 }
+
+type SoapiSrc struct {
+	Id      string `json:"id,omitempty"`
+	Code    string `json:"code,omitempty"`
+	Name    string `json:"name,omitempty"`
+	IndName string `json:"indName,omitempty"`
+}
+
+type EarlyMedicValue struct {
+	Vaccinated             bool       `json:"vaccinated,omitempty"`
+	CaseStatus             string     `json:"case-status,omitempty"`
+	EncounterStatus        string     `json:"encounter-status,omitempty"`
+	PrimaryComplain        string     `json:"pri-complain,omitempty"`
+	CurrentDiseaseHistory  string     `json:"cur-disea-hist,omitempty"`
+	SpO2                   int        `json:"spo2,omitempty"`
+	SystolicBloodPressure  int        `json:"syst-bp,omitempty"`
+	DiastolicBloodPressure int        `json:"diast-bp,omitempty"`
+	RespiratoryRate        int        `json:"resp-rate,omitempty"`
+	Pulse                  int        `json:"pulse,omitempty"`
+	Weight                 int        `json:"weight,omitempty"`
+	BloodType              string     `json:"blood-type,omitempty"`
+	Temperature            int        `json:"temp,omitempty"`
+	Height                 int        `json:"height,omitempty"`
+	PhysicalExamination    string     `json:"physical-exam,omitempty"`
+	DiagnoseSrc            []SoapiSrc `json:"diagnoseSrc,omitempty"`
+	ProcedureSrc           []SoapiSrc `json:"procedureSrc,omitempty"`
+	EarlyMedicDiagnose     string     `json:"early-med-diag,omitempty"`
+	EarlyMedicPlan         string     `json:"early-med-plan,omitempty"`
+	Therapy                string     `json:"therapy,omitempty"`
+	ExpectedOutcome        []SoapiSrc `json:"expected-outcome,omitempty"`
+}
diff --git a/internal/domain/simgos-entities/t-diagnosadanterapi/entity.go b/internal/domain/simgos-entities/t-diagnosadanterapi/entity.go
new file mode 100644
index 00000000..76be4c0f
--- /dev/null
+++ b/internal/domain/simgos-entities/t-diagnosadanterapi/entity.go
@@ -0,0 +1,51 @@
+package t_diagnosadanterapi
+
+import "time"
+
+type DiagnosaDanTerapi struct {
+	Idxterapi        int64      `gorm:"column:idxterapi;primaryKey"`
+	Idxdaftar        int64      `gorm:"column:idxdaftar"`
+	Nomr             string     `gorm:"column:nomr"`
+	Tanggal          time.Time  `gorm:"column:tanggal"`
+	TekananDarah     string     `gorm:"column:tekanan_darah"`
+	GolonganDarah    string     `gorm:"column:golongan_darah"`
+	TinggiBadan      float64    `gorm:"column:tinggi_badan"`
+	BeratBadan       float64    `gorm:"column:berat_badan"`
+	Diagnosa         string     `gorm:"column:diagnosa"`
+	Komplikasi       string     `gorm:"column:komplikasi"`
+	Terapi           string     `gorm:"column:terapi"`
+	Anamnesa         string     `gorm:"column:anamnesa"`
+	Kdpoly           int        `gorm:"column:kdpoly"`
+	Kddokter         int        `gorm:"column:kddokter"`
+	Kdtujuanrujuk    int        `gorm:"column:kdtujuanrujuk"`
+	Nip              string     `gorm:"column:nip"`
+	IcdCode          string     `gorm:"column:icd_code"`
+	KunjunganBl      int16      `gorm:"column:kunjungan_bl"`
+	KasusBl          int16      `gorm:"column:kasus_bl"`
+	Icdcm            string     `gorm:"column:icdcm"`
+	Icd9             string     `gorm:"column:icd_9"`
+	Klb              int16      `gorm:"column:klb"`
+	Bedah            int16      `gorm:"column:bedah"`
+	Jenis            int16      `gorm:"column:jenis"`
+	Perawat          string     `gorm:"column:perawat"`
+	Status           string     `gorm:"column:status"`
+	PemeriksaanFisik string     `gorm:"column:pemeriksaan_fisik"`
+	RiwayatPasien    string     `gorm:"column:riwayat_pasien"`
+	TindakanMedis    string     `gorm:"column:tindakan_medis"`
+	Rajal            int16      `gorm:"column:rajal"`
+	UserBatal        string     `gorm:"column:user_batal"`
+	TglBatal         *time.Time `gorm:"column:tgl_batal"`
+	SudahVaksin      string     `gorm:"column:sudah_vaksin"`
+	CreatedAt        time.Time  `gorm:"column:created_at"`
+	DenyutJantung    string     `gorm:"column:denyut_jantung"`
+	Pernapasan       string     `gorm:"column:pernapasan"`
+	Suhu             string     `gorm:"column:suhu"`
+	Sp02             string     `gorm:"column:sp02"`
+	TujuanPerawatan  string     `gorm:"column:tujuan_perawatan"`
+	TargetCapaian    string     `gorm:"column:target_capaian"`
+}
+
+// TableName overrides the table name used by GORM
+func (DiagnosaDanTerapi) TableName() string {
+	return "t_diagnosadanterapi"
+}