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

Merge branch 'dev' of https://github.com/dikstub-rssa/simrs-be into feat/encounter-adjustment

Browse Source 
# Conflicts:
#	cmd/main-migration/migrations/atlas.sum
This commit is contained in:
vanilia
2025-11-02 18:40:22 +07:00
parent 7e9914998f bf8ce37658
commit 558bf5aa06
15 changed files with 59 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/domain/main-entities/mcu-order/dto.go
+2 -1
View File
@@ -49,7 +49,8 @@ type FilterDto struct {
McuUrgencyLevel_Code ercl.McuUrgencyLevelCode `json:"mcuUrgencyLevel-code"`
}
type ReadDetailDto struct {
Id uint `json:"id"`
Id uint `json:"id"`
Includes string `json:"includes"`
}
type UpdateDto struct {
internal/domain/main-entities/mcu-order/entity.go
+2
View File
@@ -8,6 +8,7 @@ import (
ercl "simrs-vx/internal/domain/references/clinical"
erc "simrs-vx/internal/domain/references/common"
ere "simrs-vx/internal/domain/references/encounter"
)
type McuOrder struct {
@@ -22,6 +23,7 @@ type McuOrder struct {
Number uint8 `json:"number"`
Temperature float64 `json:"temperature"`
McuUrgencyLevel_Code ercl.McuUrgencyLevelCode `json:"mcuUrgencyLevel_code" gorm:"not null;size:15"`
Scope_Code *ere.CheckupScopeCode `json:"scope_code" gorm:"index;size:10"`
}
func (d McuOrder) IsCompleted() bool {
internal/domain/main-entities/mcu-src-category/entity.go
+1 -1
View File
@@ -9,5 +9,5 @@ type McuSrcCategory struct {
ecore.SmallMain // adjust this according to the needs
Code string `json:"code" gorm:"unique;size:20"`
Name string `json:"name" gorm:"size:50"`
Scope_Code *ere.CheckupScopeCode `json:"scope_code" gorm:"size:10"`
Scope_Code *ere.CheckupScopeCode `json:"scope_code" gorm:"index;size:10"`
}
internal/domain/main-entities/mcu-src/dto.go
+1 -1
View File
@@ -22,7 +22,7 @@ type ReadListDto struct {
type FilterDto struct {
Code string `json:"code"`
Name string `json:"name"`
McuSrcCategory_Code *string `json:"mcuSrcCategory-code"`
McuSrcCategory_Code *string `json:"mcu-src-category-code"`
Search string `json:"search" gormhelper:"searchColumns=Code,Name"`
}
internal/domain/main-entities/prescription/dto.go
+3 -2
View File
@@ -34,8 +34,9 @@ type FilterDto struct {
Status_Code *erc.DataStatusCode `json:"status-code"`
}
type ReadDetailDto struct {
Id uint `json:"id"`
Encounter_Id *uint `json:"encounter_id"`
Id uint `json:"id"`
Encounter_Id *uint `json:"encounter_id"`
Includes string `json:"includes"`
}
type UpdateDto struct {
internal/domain/main-entities/subspecialist/dto.go
+7 -4
View File
@@ -2,6 +2,7 @@ package subspecialist
import (
ecore "simrs-vx/internal/domain/base-entities/core"
es "simrs-vx/internal/domain/main-entities/specialist"
espb "simrs-vx/internal/domain/main-entities/subspecialist-position/base"
)
@@ -48,10 +49,11 @@ type MetaDto struct {
type ResponseDto struct {
ecore.SmallMain
Code string `json:"code"`
Name string `json:"name"`
Specialist_Id *uint16 `json:"specialist_id"`
Subspecialist []espb.Basic `json:"subspecialistPositions,omitempty"`
Code string `json:"code"`
Name string `json:"name"`
Specialist_Id *uint16 `json:"specialist_id"`
Specialist *es.Specialist `json:"specialist,omitempty"`
Subspecialist []espb.Basic `json:"subspecialistPositions,omitempty"`
}
func (d Subspecialist) ToResponse() ResponseDto {
@@ -59,6 +61,7 @@ func (d Subspecialist) ToResponse() ResponseDto {
Code: d.Code,
Name: d.Name,
Specialist_Id: d.Specialist_Id,
Specialist: d.Specialist,
Subspecialist: d.SubspecialistPositions,
}
resp.SmallMain = d.SmallMain