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

cmd/main-migration/migrations/atlas.sum

@@ -1,4 +1,4 @@
-h1:Q2e6TNVbdE4yvg1W/bZvcNzYuBjy1kIT2z0QVbyWDYY=
+h1:UQi1THfG0QI80rmHgbXNK/vgQv+5eUA5VRy3zqfWdbI=
 20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k=
 20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0=
 20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI=
@@ -19,4 +19,3 @@ h1:Q2e6TNVbdE4yvg1W/bZvcNzYuBjy1kIT2z0QVbyWDYY=
 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/soapi/dto.go

@@ -1,19 +1,23 @@
 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"
 
+	erc "simrs-vx/internal/domain/references/clinical"
+
 	pa "simrs-vx/pkg/auth-helper"
-	"time"
 )
 
 type CreateDto struct {
-	Encounter_Id *uint      `json:"encounter_id"`
-	Employee_Id  *uint      `json:"-"`
-	Time         *time.Time `json:"time"`
-	Value        *string    `json:"value"`
+	Encounter_Id *uint             `json:"encounter_id"`
+	Employee_Id  *uint             `json:"-"`
+	Time         *time.Time        `json:"time"`
+	TypeCode     erc.SoapiTypeCode `json:"typeCode"`
+	Value        *string           `json:"value"`
 
 	pa.AuthInfo
 }
@@ -25,10 +29,11 @@ type ReadListDto struct {
 }
 
 type FilterDto struct {
-	Encounter_Id *uint      `json:"encounter_id"`
-	Employee_Id  *uint      `json:"employee_id"`
-	Time         *time.Time `json:"time"`
-	Value        *string    `json:"value"`
+	Encounter_Id *uint             `json:"encounter_id"`
+	Employee_Id  *uint             `json:"employee_id"`
+	Time         *time.Time        `json:"time"`
+	TypeCode     erc.SoapiTypeCode `json:"typeCode"`
+	Value        *string           `json:"value"`
 
 	Page         int `json:"page"`
 	PageSize     int `json:"page_size"`
@@ -56,12 +61,13 @@ type MetaDto struct {
 
 type ResponseDto struct {
 	ecore.Main
-	Encounter_Id *uint         `json:"encounter_id"`
-	Encounter    *ee.Encounter `json:"encounter,omitempty"`
-	Employee_Id  *uint         `json:"employee_id"`
-	Employee     *eem.Employee `json:"employee,omitempty"`
-	Time         *time.Time    `json:"time"`
-	Value        *string       `json:"value"`
+	Encounter_Id *uint             `json:"encounter_id"`
+	Encounter    *ee.Encounter     `json:"encounter,omitempty"`
+	Employee_Id  *uint             `json:"employee_id"`
+	Employee     *eem.Employee     `json:"employee,omitempty"`
+	Time         *time.Time        `json:"time"`
+	TypeCode     erc.SoapiTypeCode `json:"typeCode"`
+	Value        *string           `json:"value"`
 }
 
 func (d Soapi) ToResponse() ResponseDto {
@@ -71,6 +77,7 @@ func (d Soapi) ToResponse() ResponseDto {
 		Employee_Id:  d.Employee_Id,
 		Employee:     d.Employee,
 		Time:         d.Time,
+		TypeCode:     d.TypeCode,
 		Value:        d.Value,
 	}
 	resp.Main = d.Main

internal/use-case/main-use-case/soapi/helper.go

@@ -20,5 +20,6 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Soapi) {
 	data.Encounter_Id = inputSrc.Encounter_Id
 	data.Employee_Id = inputSrc.Employee_Id
 	data.Time = inputSrc.Time
+	data.TypeCode = inputSrc.TypeCode
 	data.Value = inputSrc.Value
 }