munawwirul_jamal/simrsx-be
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
dpurbosakti
2025-09-30 11:12:02 +07:00
parent 0f86c0827c fee4f723d8
commit 78df1fd8b4
3 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/main-migration/migrations/atlas.sum
+1 -2
View File
@@ -1,4 +1,4 @@
h1:Q2e6TNVbdE4yvg1W/bZvcNzYuBjy1kIT2z0QVbyWDYY= h1:UQi1THfG0QI80rmHgbXNK/vgQv+5eUA5VRy3zqfWdbI=
20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k= 20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k=
20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0= 20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0=
20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI= 20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI=
@@ -19,4 +19,3 @@ h1:Q2e6TNVbdE4yvg1W/bZvcNzYuBjy1kIT2z0QVbyWDYY=
20250924051317.sql h1:yQuW6SwJxIOM5fcxeAaie5lSm1oLysU/C2hH2xNCVoQ= 20250924051317.sql h1:yQuW6SwJxIOM5fcxeAaie5lSm1oLysU/C2hH2xNCVoQ=
20250929034321.sql h1:101FJ8VH12mrZWlt/X1gvKUGOhoiF8tFbjiapAjnHzg= 20250929034321.sql h1:101FJ8VH12mrZWlt/X1gvKUGOhoiF8tFbjiapAjnHzg=
20250929034428.sql h1:i+pROD9p+g5dOmmZma6WF/0Hw5g3Ha28NN85iTo1K34= 20250929034428.sql h1:i+pROD9p+g5dOmmZma6WF/0Hw5g3Ha28NN85iTo1K34=
20250930025550.sql h1:cUvQcYn+4BoID3BGn2JriESuD7WactMf/fp48EFwtAA=
internal/domain/main-entities/soapi/dto.go
+22 -15
View File
@@ -1,19 +1,23 @@
package soapi package soapi
import ( import (
"time"
ecore "simrs-vx/internal/domain/base-entities/core" ecore "simrs-vx/internal/domain/base-entities/core"
eem "simrs-vx/internal/domain/main-entities/employee" eem "simrs-vx/internal/domain/main-entities/employee"
ee "simrs-vx/internal/domain/main-entities/encounter" ee "simrs-vx/internal/domain/main-entities/encounter"
erc "simrs-vx/internal/domain/references/clinical"
pa "simrs-vx/pkg/auth-helper" pa "simrs-vx/pkg/auth-helper"
"time"
) )
type CreateDto struct { type CreateDto struct {
Encounter_Id *uint `json:"encounter_id"` Encounter_Id *uint `json:"encounter_id"`
Employee_Id *uint `json:"-"` Employee_Id *uint `json:"-"`
Time *time.Time `json:"time"` Time *time.Time `json:"time"`
Value *string `json:"value"` TypeCode erc.SoapiTypeCode `json:"typeCode"`
Value *string `json:"value"`
pa.AuthInfo pa.AuthInfo
} }
@@ -25,10 +29,11 @@ type ReadListDto struct {
} }
type FilterDto struct { type FilterDto struct {
Encounter_Id *uint `json:"encounter_id"` Encounter_Id *uint `json:"encounter_id"`
Employee_Id *uint `json:"employee_id"` Employee_Id *uint `json:"employee_id"`
Time *time.Time `json:"time"` Time *time.Time `json:"time"`
Value *string `json:"value"` TypeCode erc.SoapiTypeCode `json:"typeCode"`
Value *string `json:"value"`
Page int `json:"page"` Page int `json:"page"`
PageSize int `json:"page_size"` PageSize int `json:"page_size"`
@@ -56,12 +61,13 @@ type MetaDto struct {
type ResponseDto struct { type ResponseDto struct {
ecore.Main ecore.Main
Encounter_Id *uint `json:"encounter_id"` Encounter_Id *uint `json:"encounter_id"`
Encounter *ee.Encounter `json:"encounter,omitempty"` Encounter *ee.Encounter `json:"encounter,omitempty"`
Employee_Id *uint `json:"employee_id"` Employee_Id *uint `json:"employee_id"`
Employee *eem.Employee `json:"employee,omitempty"` Employee *eem.Employee `json:"employee,omitempty"`
Time *time.Time `json:"time"` Time *time.Time `json:"time"`
Value *string `json:"value"` TypeCode erc.SoapiTypeCode `json:"typeCode"`
Value *string `json:"value"`
} }
func (d Soapi) ToResponse() ResponseDto { func (d Soapi) ToResponse() ResponseDto {
@@ -71,6 +77,7 @@ func (d Soapi) ToResponse() ResponseDto {
Employee_Id: d.Employee_Id, Employee_Id: d.Employee_Id,
Employee: d.Employee, Employee: d.Employee,
Time: d.Time, Time: d.Time,
TypeCode: d.TypeCode,
Value: d.Value, Value: d.Value,
} }
resp.Main = d.Main resp.Main = d.Main
internal/use-case/main-use-case/soapi/helper.go
+1
View File
@@ -20,5 +20,6 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Soapi) {
data.Encounter_Id = inputSrc.Encounter_Id data.Encounter_Id = inputSrc.Encounter_Id
data.Employee_Id = inputSrc.Employee_Id data.Employee_Id = inputSrc.Employee_Id
data.Time = inputSrc.Time data.Time = inputSrc.Time
data.TypeCode = inputSrc.TypeCode
data.Value = inputSrc.Value data.Value = inputSrc.Value
} }