Merge branch 'migration' of github.com:dikstub-rssa/simrs-be into feat/medicine-mix-prescription-37

cmd/main-migration/migrations/20250929034321.sql

@@ -0,0 +1,2 @@
+-- Modify "Soapi" table
+ALTER TABLE "public"."Soapi" ADD COLUMN "TypeCode" text NULL;

cmd/main-migration/migrations/20250929034428.sql

@@ -0,0 +1,2 @@
+-- Modify "Soapi" table
+ALTER TABLE "public"."Soapi" ALTER COLUMN "TypeCode" TYPE character varying(11);

cmd/main-migration/migrations/20250930025550.sql

@@ -0,0 +1,6 @@
+-- Modify "MedicationItem" table
+ALTER TABLE "public"."MedicationItem" ALTER COLUMN "Usage" TYPE character varying(255), ADD COLUMN "Frequency" integer NULL, ADD COLUMN "Dose" numeric NULL;
+-- Modify "PrescriptionItem" table
+ALTER TABLE "public"."PrescriptionItem" ALTER COLUMN "Usage" TYPE character varying(255), ADD COLUMN "Frequency" integer NULL, ADD COLUMN "Dose" numeric NULL;
+-- Modify "MedicineMix" table
+ALTER TABLE "public"."MedicineMix" ADD COLUMN "Uom_Code" character varying(10) NULL, ADD CONSTRAINT "fk_MedicineMix_Uom" FOREIGN KEY ("Uom_Code") REFERENCES "public"."Uom" ("Code") ON UPDATE NO ACTION ON DELETE NO ACTION;

cmd/main-migration/migrations/atlas.sum

@@ -1,19 +1,22 @@
-h1:eOZHhYflqYtiRTD78THsLwQxQbS9eIvsRFQBtcsT670=
+h1:Q2e6TNVbdE4yvg1W/bZvcNzYuBjy1kIT2z0QVbyWDYY=
-20250904105930.sql h1:Vv4vCurl7m7/ZB6TjRpkubHpQ4RYwSUn0QHdzfoGpzY=
+20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k=
-20250904141448.sql h1:FYCHH9Os4KkrZMDu/jR8FMP+wLMRW+Mb0PkLU/9BRDg=
+20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0=
-20250908062237.sql h1:oanBpKZd+akPu2I/xYhUSbd0G5tAFbXzKLER/Zs8ENI=
+20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI=
-20250908062323.sql h1:miNG9COddXkD1jGTgaROMAZ618eT6oiLGiJhXWnQwhE=
+20250908062323.sql h1:oXl6Z143tOpIl4EfP4B8JNU8LrMvVmHEtCgAfiB4gs8=
-20250908073811.sql h1:gOi5cnGG1htlpfizybYmUIT0vYjZTBfXiI0nPSYK2u8=
+20250908073811.sql h1:m2aNXfnGxnLq1+rVWrh4f60q7fhyhV3gEwNu/OIqQlE=
-20250908073839.sql h1:cWNDA4YikjoOteAJuNLFILjQUJPFB6o8Wxreiek4QyI=
+20250908073839.sql h1:cPk54xjLdMs26uY8ZHjNWLuyfAMzV7Zb0/9oJQrsw04=
-20250910055902.sql h1:nxxOGnU0BbH/v3IPgeIOXOwH8d3tKomw7h6FTeMnnBs=
+20250910055902.sql h1:5xwjAV6QbtZT9empTJKfhyAjdknbHzb15B0Ku5dzqtQ=
-20250915123412.sql h1:mz7SiWfrdf0qE1VTSAAnA/147d6gyp6ry5vZ2bR9SH0=
+20250915123412.sql h1:D83xaU2YlDEd21HLup/YQpQ2easMToYCyy/oK6AFgQs=
-20250916043819.sql h1:RHXVtmMkB6wfv06HfPyHMBmUfIpFt1xveafNz0kwKnE=
+20250916043819.sql h1:ekoTJsBqQZ8G8n0qJ03d13+eoNoc7sAUEQGA5D/CCxk=
-20250917040616.sql h1:MYVDht+akBlzQGKNu2hTTTLPEcH1bxT/Q8MK6WEtuhs=
+20250917040616.sql h1:zoCnmcXuM7AVv85SmN7RmFglCgJnoDmpRWExH0LAc9Q=
-20250917040751.sql h1:J79YyS2JzWgh5oKXMTgh67uo3gLxKaAsxRiZmSIfjBs=
+20250917040751.sql h1:J1xyRrh32y1+lezwAyNwPcUQ6ABBSgbvzNLva4SVdQU=
-20250917045138.sql h1:/SM1N4O8X3yxpoJgMEARmS1uOkuLKsTOy4PLsRCOKaQ=
+20250917045138.sql h1:jKe1Z0uOLG4SGBYM+S/3P+/zMPztmgoderD5swnMuCg=
-20250917093645.sql h1:PNBTGZ7s10e5b5+Tie8YfVQBN0zKtJ5T34oK1iOUEb4=
+20250917093645.sql h1:cNI3Pbz1R3LxvIXLuexafJFCXUXrmuFCgXXJ2sG+FW0=
-20250918073552.sql h1:jG7+g3i8ODYaJdcdZz12v3nbsZ5mB9wG6kWnGyTQIRI=
+20250918073552.sql h1:RJ1SvMzP6aeWnoPVD3eVAmIQOkcp6Php8z3QRri6v4g=
-20250918073742.sql h1:j+rgw7puxE7s+phqPVZHmPk0af3rcaA56Itp86y1suY=
+20250918073742.sql h1:+cEsnJTJFybe2fR69ZoOiX2R6c6iITl4m6WTZ1hjyzY=
-20250918074745.sql h1:rPmP4DXs6OnY4Vp+xO/z9jFpJt/RrJ52SJJjIIxeDvc=
+20250918074745.sql h1:2hNVQCXF/dVYXAh+T/7oBFgERGWxzVb2FXJjwkFWGCI=
-20250923025134.sql h1:2r6pcwnBSU5Y9Czk1OHBoh4yZXiMtEca9X8843fTEX0=
+20250923025134.sql h1:Ykz/qpHiGDXPsCsWTjydQFVSibZP2D+h2fIeb2h2JGA=
-20250924051317.sql h1:iUAk2gsGoEGIPQ0lEEUp8maMSId8emNbP+kP712ABIA=
+20250924051317.sql h1:yQuW6SwJxIOM5fcxeAaie5lSm1oLysU/C2hH2xNCVoQ=
+20250929034321.sql h1:101FJ8VH12mrZWlt/X1gvKUGOhoiF8tFbjiapAjnHzg=
+20250929034428.sql h1:i+pROD9p+g5dOmmZma6WF/0Hw5g3Ha28NN85iTo1K34=
+20250930025550.sql h1:cUvQcYn+4BoID3BGn2JriESuD7WactMf/fp48EFwtAA=

internal/domain/main-entities/medication-item/dto.go

@@ -13,11 +13,14 @@ type CreateDto struct {
 	IsMix             bool             `json:"isMix"`
 	Medicine_Id       *uint            `json:"medicine_id"`
 	MedicineMix_Id    *uint            `json:"medicineMix_id"`
-	Usage             float64          `json:"usage"`
+	Frequency         *uint16          `json:"frequency"`
+	Dose              float64          `json:"dose"`
+	Usage             string           `json:"usage"`
 	Interval          uint8            `json:"interval"`
 	IntervalUnit_Code erc.TimeUnitCode `json:"intervalUnit_code"`
 	IsRedeemed        bool             `json:"isRedeemed"`
 	Quantity          float64          `json:"quantity"`
+	Quantity          float64          `json:"quantity"`
 	Note              *string          `json:"note" gorm:"size:1024"`
 }
 
@@ -71,7 +74,7 @@ type ResponseDto struct {
 	Medicine          *em.Medicine     `json:"medicine,omitempty"`
 	MedicineMix_Id    *uint            `json:"medicineMix_id"`
 	MedicineMix       *emm.MedicineMix `json:"medicineMix,omitempty"`
-	Usage             float64          `json:"usage"`
+	Usage             string           `json:"usage"`
 	Interval          uint8            `json:"interval"`
 	IntervalUnit_Code erc.TimeUnitCode `json:"intervalUnit_code"`
 	IsRedeemed        bool             `json:"isRedeemed"`

internal/domain/main-entities/medication-item/entity.go

@@ -18,7 +18,9 @@ type MedicationItem struct {
 	Medicine          *em.Medicine     `json:"medicine,omitempty" gorm:"foreignKey:Medicine_Id;references:Id"`
 	MedicineMix_Id    *uint            `json:"medicineMix_id"`
 	MedicineMix       *emm.MedicineMix `json:"medicineMix,omitempty" gorm:"foreignKey:MedicineMix_Id;references:Id"`
-	Usage             float64          `json:"usage"`
+	Frequency         *uint16          `json:"frequency"`
+	Dose              float64          `json:"dose"`
+	Usage             string           `json:"usage" gorm:"size:255"`
 	Interval          uint8            `json:"interval"`
 	IntervalUnit_Code erc.TimeUnitCode `json:"intervalUnit_code"`
 	IsRedeemed        bool             `json:"isRedeemed"`

internal/domain/main-entities/medicine-mix/entity.go

@@ -3,10 +3,13 @@ package medicinemix
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
 	emmi "simrs-vx/internal/domain/main-entities/medicine-mix-item"
+	eu "simrs-vx/internal/domain/main-entities/uom"
 )
 
 type MedicineMix struct {
 	ecore.Main                         // adjust this according to the needs
 	Name       string                  `json:"name" gorm:"size:50"`
+	Uom_Code   *string                 `json:"uom_code" gorm:"size:10"`
+	Uom        *eu.Uom                 `json:"uom" gorm:"foreignKey:Uom_Code;references:Code"`
 	MixItems   []*emmi.MedicineMixItem `json:"mixItems" gorm:"foreignKey:MedicineMix_Id;references:Id"`
 }

internal/domain/main-entities/prescription-item/dto.go

@@ -9,14 +9,16 @@ import (
 )
 
 type CreateDto struct {
-	Prescription_Id   *uint            `json:"prescription_id"`
+	Prescription_Id    *uint            `json:"prescription_id"`
-	IsMix             bool             `json:"isMix"`
+	IsMix              bool             `json:"isMix"`
-	Medicine_Id       *uint            `json:"medicine_id"`
+	Medicine_Id        *uint            `json:"medicine_id"`
-	MedicineMix_Id    *uint            `json:"medicineMix_id"`
+	MedicineMix_Id     *uint            `json:"medicineMix_id"`
-	Usage             float64          `json:"usage"`
+	Frequency          *uint16          `json:"frequency"`
-	Interval          uint8            `json:"interval"`
+	Dose               float64          `json:"dose"`
-	IntervalUnit_Code erc.TimeUnitCode `json:"intervalUnit_code"`
+	Usage              float64          `json:"usage"`
-	Quantity          float64          `json:"quantity"`
+	Interval           uint8            `json:"interval"`
+	IntervalUnit_Code  erc.TimeUnitCode `json:"intervalUnit_code"`
+	IntervalMultiplier *uint16          `json:"intervalMultiplier"`
 }
 
 type ReadListDto struct {
@@ -67,7 +69,9 @@ type ResponseDto struct {
 	Medicine          *em.Medicine     `json:"medicine,omitempty"`
 	MedicineMix_Id    *uint            `json:"medicineMix_id"`
 	MedicineMix       *emm.MedicineMix `json:"medicineMix,omitempty"`
-	Usage             float64          `json:"usage"`
+	Frequency         *uint16          `json:"frequency"`
+	Dose              float64          `json:"dose"`
+	Usage             string           `json:"usage"`
 	Interval          uint8            `json:"interval"`
 	IntervalUnit_Code erc.TimeUnitCode `json:"intervalUnit_code"`
 	Quantity          float64          `json:"quantity"`
@@ -82,6 +86,8 @@ func (d PrescriptionItem) ToResponse() ResponseDto {
 		Medicine:          d.Medicine,
 		MedicineMix_Id:    d.MedicineMix_Id,
 		MedicineMix:       d.MedicineMix,
+		Frequency:         d.Frequency,
+		Dose:              d.Dose,
 		Usage:             d.Usage,
 		Interval:          d.Interval,
 		IntervalUnit_Code: d.IntervalUnit_Code,

internal/domain/main-entities/prescription-item/entity.go

@@ -18,7 +18,9 @@ type PrescriptionItem struct {
 	Medicine          *em.Medicine     `json:"medicine,omitempty" gorm:"foreignKey:Medicine_Id;references:Id"`
 	MedicineMix_Id    *uint            `json:"medicineMix_id"`
 	MedicineMix       *emm.MedicineMix `json:"medicineMix,omitempty" gorm:"foreignKey:MedicineMix_Id;references:Id"`
-	Usage             float64          `json:"usage"`
+	Frequency         *uint16          `json:"frequency"`
+	Dose              float64          `json:"dose"`
+	Usage             string           `json:"usage" gorm:"size:255"`
 	Interval          uint8            `json:"interval"`
 	IntervalUnit_Code erc.TimeUnitCode `json:"intervalUnit_code"`
 	Quantity          float64          `json:"quantity"`

internal/domain/main-entities/soapi/entity.go

@@ -1,18 +1,22 @@
 package soapi
 
 import (
+	"time"
+
 	ecore "simrs-vx/internal/domain/base-entities/core"
 	eem "simrs-vx/internal/domain/main-entities/employee"
 	ee "simrs-vx/internal/domain/main-entities/encounter"
-	"time"
+
+	erc "simrs-vx/internal/domain/references/clinical"
 )
 
 type Soapi struct {
-	ecore.Main                 // adjust this according to the needs
+	ecore.Main                     // adjust this according to the needs
-	Encounter_Id *uint         `json:"encounter_id"`
+	Encounter_Id *uint             `json:"encounter_id"`
-	Encounter    *ee.Encounter `json:"encounter,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
+	Encounter    *ee.Encounter     `json:"encounter,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
-	Employee_Id  *uint         `json:"employee_id"`
+	Employee_Id  *uint             `json:"employee_id"`
-	Employee     *eem.Employee `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
+	Employee     *eem.Employee     `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
-	Time         *time.Time    `json:"time"`
+	Time         *time.Time        `json:"time"`
-	Value        *string       `json:"value"`
+	TypeCode     erc.SoapiTypeCode `json:"type_code" gorm:"size:11"`
+	Value        *string           `json:"value"`
 }

internal/domain/references/clinical/clinical.go

@@ -8,11 +8,12 @@ type (
 	PlanCode            string
 	InstructionCode     string
 	McuUrgencyLevelCode string
+	SoapiTypeCode       string
 )
 
 const (
-	SCPrimaryComplaint      SubjectCode = "pri-compl"      // Keluhan Utama
+	SCPrimaryComplaint      SubjectCode = "pri-complain"   // Keluhan Utama
-	SCSecComplaint          SubjectCode = "sec-compl"      // Secondary Complaint
+	SCSecComplaint          SubjectCode = "sec-complain"   // Secondary Complaint
 	SCCurrentDiseaseHistory SubjectCode = "cur-disea-hist" // Current Disease History
 	SCPastDiseaseHistory    SubjectCode = "pas-disea-hist" // Past Disease History
 	SCFamilyDiseaseHistory  SubjectCode = "fam-disea-hist" // Family Disease History
@@ -47,6 +48,10 @@ const (
 	MULCBG      McuUrgencyLevelCode = "blood-gas"
 	MULCPF      McuUrgencyLevelCode = "priority-form"
 	MULCRT      McuUrgencyLevelCode = "routine"
+
+	STCEarly  SoapiTypeCode = "early"       // Kajian Awal Medis
+	STCERehab SoapiTypeCode = "early-rehab" // Kajian Awal Rehab Medik
+	STCFunc   SoapiTypeCode = "function"    // Assessment Fungsi
 )
 
 type Soapi struct {

internal/domain/references/organization/organization.go

@@ -15,6 +15,8 @@ const (
 	UPCLab UserPosisitionCode = "laborant"            // Laboran
 	UPCPha UserPosisitionCode = "pharmacy"            // Farmasi
 	UPCPay UserPosisitionCode = "payment"             // Pembayaran
+	UPCHur UserPosisitionCode = "human-resource"      // Sumber Daya Manusia
+	UPCGea UserPosisitionCode = "general-affair"      // Bagian Umu
 	UPCPav UserPosisitionCode = "payment-verificator" // Konfirmasi pembayaran
 	UPCMan UserPosisitionCode = "management"          // Manajemen
 	UPCInt UserPosisitionCode = "specialist-intern"   // PPDS