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

medicine_id into medicine_code in several medications related

Browse Source
This commit is contained in:
dpurbosakti
2025-11-11 15:24:35 +07:00
parent aa56c987a9
commit 4d5bc188fc
22 changed files with 130 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/domain/main-entities/medication-item-dist/dto.go
+4 -4
View File
@@ -18,7 +18,7 @@ type CreateDto struct {
MedicationItem_Id *uint `json:"medicationItem_id"`
DateTime *time.Time `json:"dateTime"`
Remain float64 `json:"remain"`
Nurse_Id *uint `json:"nurse_id"`
Nurse_Code *string `json:"nurse_code"`
}
type ReadListDto struct {
@@ -31,7 +31,7 @@ type FilterDto struct {
MedicationItem_Id *uint `json:"medicationItem-id"`
DateTime *time.Time `json:"dateTime"`
Remain float64 `json:"remain"`
Nurse_Id *uint `json:"nurse-id"`
Nurse_Code *string `json:"nurse-code"`
}
type ReadDetailDto struct {
Id uint16 `json:"id"`
@@ -65,7 +65,7 @@ type ResponseDto struct {
MedicationItem *emi.MedicationItem `json:"medicationItem,omitempty"`
DateTime *time.Time `json:"dateTime"`
Remain float64 `json:"remain"`
Nurse_Id *uint `json:"nurse_id"`
Nurse_Code *string `json:"nurse_code"`
}
func (d MedicationItemDist) ToResponse() ResponseDto {
@@ -74,7 +74,7 @@ func (d MedicationItemDist) ToResponse() ResponseDto {
MedicationItem: d.MedicationItem,
DateTime: d.DateTime,
Remain: d.Remain,
Nurse_Id: d.Nurse_Id,
Nurse_Code: d.Nurse_Code,
}
resp.Main = d.Main
return resp
internal/domain/main-entities/medication-item-dist/entity.go
+1 -2
View File
@@ -14,7 +14,6 @@ type MedicationItemDist struct {
MedicationItem *emi.MedicationItem `json:"medicationItem,omitempty" gorm:"foreignKey:MedicationItem_Id;references:Id"`
DateTime *time.Time `json:"dateTime"`
Remain float64 `json:"remain"`
Nurse_Id *uint `json:"nurse_id"`
Nurse_Code *string `json:"nurse_code"`
Nurse *en.Nurse `json:"nurse,omitempty" gorm:"foreignKey:Nurse_Id;references:Id"`
Nurse *en.Nurse `json:"nurse,omitempty" gorm:"foreignKey:Nurse_Code;references:Code"`
}
internal/domain/main-entities/medication-item/dto.go
+4 -4
View File
@@ -12,7 +12,7 @@ import (
type CreateDto struct {
Medication_Id *uint `json:"medication_id"`
IsMix bool `json:"isMix"`
Medicine_Id *uint `json:"medicine_id"`
Medicine_Code *string `json:"medicine_code"`
MedicineMix_Id *uint `json:"medicineMix_id"`
Frequency *uint16 `json:"frequency"`
Dose float64 `json:"dose"`
@@ -35,7 +35,7 @@ type ReadListDto struct {
type FilterDto struct {
Medication_Id *uint `json:"medication-id"`
IsMix bool `json:"isMix"`
Medicine_Id *uint `json:"medicine-id"`
Medicine_Code *string `json:"medicine-code"`
MedicineMix_Id *uint `json:"medicineMix-id"`
Usage float64 `json:"usage"`
Interval uint8 `json:"interval"`
@@ -68,7 +68,7 @@ type ResponseDto struct {
Medication_Id *uint `json:"medication_id"`
Medication *eme.Medication `json:"medication,omitempty"`
IsMix bool `json:"isMix"`
Medicine_Id *uint `json:"medicine_id"`
Medicine_Code *string `json:"medicine_code"`
Medicine *em.Medicine `json:"medicine,omitempty"`
MedicineMix_Id *uint `json:"medicineMix_id"`
MedicineMix *emm.MedicineMix `json:"medicineMix,omitempty"`
@@ -85,7 +85,7 @@ func (d MedicationItem) ToResponse() ResponseDto {
Medication_Id: d.Medication_Id,
Medication: d.Medication,
IsMix: d.IsMix,
Medicine_Id: d.Medicine_Id,
Medicine_Code: d.Medicine_Code,
Medicine: d.Medicine,
MedicineMix_Id: d.MedicineMix_Id,
MedicineMix: d.MedicineMix,
internal/domain/main-entities/medication-item/entity.go
+1 -2
View File
@@ -14,9 +14,8 @@ type MedicationItem struct {
Medication_Id *uint `json:"medication_id"`
Medication *eme.Medication `json:"medication,omitempty" gorm:"foreignKey:Medication_Id;references:Id"`
IsMix bool `json:"isMix"`
Medicine_Id *uint `json:"medicine_id"`
Medicine_Code *string `json:"medicine_code"`
Medicine *em.Medicine `json:"medicine,omitempty" gorm:"foreignKey:Medicine_Id;references:Id"`
Medicine *em.Medicine `json:"medicine,omitempty" gorm:"foreignKey:Medicine_Code;references:Code"`
MedicineMix_Id *uint `json:"medicineMix_id"`
MedicineMix *emm.MedicineMix `json:"medicineMix,omitempty" gorm:"foreignKey:MedicineMix_Id;references:Id"`
Frequency *uint16 `json:"frequency"`
internal/domain/main-entities/medication/dto.go
+20 -20
View File
@@ -19,10 +19,10 @@ import (
)
type CreateDto struct {
Encounter_Id *uint `json:"encounter_id"`
IssuedAt *time.Time `json:"issuedAt"`
Pharmacist_Id *uint `json:"pharmacist_id"`
Status_Code erc.DataStatusCode `json:"status_code"`
Encounter_Id *uint `json:"encounter_id"`
IssuedAt *time.Time `json:"issuedAt"`
Pharmacist_Code *string `json:"pharmacist_code"`
Status_Code erc.DataStatusCode `json:"status_code"`
}
type ReadListDto struct {
@@ -32,10 +32,10 @@ type ReadListDto struct {
}
type FilterDto struct {
Encounter_Id *uint `json:"encounter-id"`
IssuedAt *time.Time `json:"issuedAt"`
Pharmacist_Id *uint `json:"pharmacist-id"`
Status_Code erc.DataStatusCode `json:"status-code"`
Encounter_Id *uint `json:"encounter-id"`
IssuedAt *time.Time `json:"issuedAt"`
Pharmacist_Code *string `json:"pharmacist-code"`
Status_Code erc.DataStatusCode `json:"status-code"`
}
type ReadDetailDto struct {
Id uint `json:"id"`
@@ -61,22 +61,22 @@ type MetaDto struct {
type ResponseDto struct {
ecore.Main
Encounter_Id *uint `json:"encounter_id"`
Encounter *ee.Encounter `json:"encounter,omitempty"`
IssuedAt *time.Time `json:"issuedAt"`
Pharmacist_Id *uint `json:"pharmacist_id"`
Pharmacist *ep.Pharmacist `json:"pharmacist,omitempty"`
Status_Code erc.DataStatusCode `json:"status_code"`
Encounter_Id *uint `json:"encounter_id"`
Encounter *ee.Encounter `json:"encounter,omitempty"`
IssuedAt *time.Time `json:"issuedAt"`
Pharmacist_Code *string `json:"pharmacist_code"`
Pharmacist *ep.Pharmacist `json:"pharmacist,omitempty"`
Status_Code erc.DataStatusCode `json:"status_code"`
}
func (d Medication) ToResponse() ResponseDto {
resp := ResponseDto{
Encounter_Id: d.Encounter_Id,
Encounter: d.Encounter,
IssuedAt: d.IssuedAt,
Pharmacist_Id: d.Pharmacist_Id,
Pharmacist: d.Pharmacist,
Status_Code: d.Status_Code,
Encounter_Id: d.Encounter_Id,
Encounter: d.Encounter,
IssuedAt: d.IssuedAt,
Pharmacist_Code: d.Pharmacist_Code,
Pharmacist: d.Pharmacist,
Status_Code: d.Status_Code,
}
resp.Main = d.Main
return resp
internal/domain/main-entities/medication/entity.go
+1 -2
View File
@@ -15,9 +15,8 @@ type Medication struct {
Encounter_Id *uint `json:"encounter_id"`
Encounter *ee.Encounter `json:"encounter,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
IssuedAt *time.Time `json:"issuedAt"`
Pharmacist_Id *uint `json:"pharmacist_id"`
Pharmacist_Code *string `json:"pharmacist_code"`
Pharmacist *ep.Pharmacist `json:"pharmacist,omitempty" gorm:"foreignKey:Pharmacist_Id;references:Id"`
Pharmacist *ep.Pharmacist `json:"pharmacist,omitempty" gorm:"foreignKey:Pharmacist_Code;references:Code"`
Status_Code erc.DataStatusCode `json:"status_code"`
}
internal/domain/main-entities/medicine-mix-item/dto.go
+4 -4
View File
@@ -7,7 +7,7 @@ import (
type CreateDto struct {
MedicineMix_Id *uint `json:"medicineMix_id"`
Medicine_Id *uint `json:"medicine_id"`
Medicine_Code *string `json:"medicine_code"`
Dose *uint8 `json:"dose"`
Note *string `json:"note" gom:"size:1024"`
}
@@ -20,7 +20,7 @@ type ReadListDto struct {
type FilterDto struct {
MedicineMix_Id *uint `json:"medicineMix-id"`
Medicine_Id *uint `json:"medicine-id"`
Medicine_Code *string `json:"medicine-code"`
Dose *uint8 `json:"dose"`
Note *string `json:"note" gom:"size:1024"`
}
@@ -47,7 +47,7 @@ type MetaDto struct {
type ResponseDto struct {
ecore.Main
MedicineMix_Id *uint `json:"medicineMix_id"`
Medicine_Id *uint `json:"medicine_id"`
Medicine_Code *string `json:"medicine_code"`
Medicine *em.Medicine `json:"medicine,omitempty"`
Dose *uint8 `json:"dose"`
Note *string `json:"note" gom:"size:1024"`
@@ -56,7 +56,7 @@ type ResponseDto struct {
func (d MedicineMixItem) ToResponse() ResponseDto {
resp := ResponseDto{
MedicineMix_Id: d.MedicineMix_Id,
Medicine_Id: d.Medicine_Id,
Medicine_Code: d.Medicine_Code,
Medicine: d.Medicine,
Dose: d.Dose,
Note: d.Note,
internal/domain/main-entities/medicine-mix-item/entity.go
+1 -2
View File
@@ -8,9 +8,8 @@ import (
type MedicineMixItem struct {
ecore.Main // adjust this according to the needs
MedicineMix_Id *uint `json:"medicineMix_id"`
Medicine_Id *uint `json:"medicine_id"`
Medicine_Code *string `json:"medicine_code"`
Medicine *em.Medicine `json:"medicine,omitempty" gorm:"foreignKey:Medicine_Id;references:Id"`
Medicine *em.Medicine `json:"medicine,omitempty" gorm:"foreignKey:Medicine_Code;references:Code"`
Dose *uint8 `json:"dose"`
Note *string `json:"note" gom:"size:1024"`
}
internal/domain/main-entities/prescription-item/dto.go
+4 -4
View File
@@ -12,7 +12,7 @@ import (
type CreateDto struct {
Prescription_Id *uint `json:"prescription_id"`
IsMix bool `json:"isMix"`
Medicine_Id *uint `json:"medicine_id"`
Medicine_Code *string `json:"medicine_code"`
MedicineMix_Id *uint `json:"medicineMix_id"`
Frequency *uint16 `json:"frequency" validate:"required"`
Dose float64 `json:"dose" validate:"required"`
@@ -32,7 +32,7 @@ type ReadListDto struct {
type FilterDto struct {
Prescription_Id *uint `json:"prescription-id"`
IsMix bool `json:"isMix"`
Medicine_Id *uint `json:"medicine-id"`
Medicine_Code *string `json:"medicine-code"`
MedicineMix_Id *uint `json:"medicineMix-id"`
Usage float64 `json:"usage"`
Interval uint8 `json:"interval"`
@@ -63,7 +63,7 @@ type ResponseDto struct {
Prescription_Id *uint `json:"prescription_id"`
Prescription *ep.Prescription `json:"prescription,omitempty"`
IsMix bool `json:"isMix"`
Medicine_Id *uint `json:"medicine_id"`
Medicine_Code *string `json:"medicine_code"`
Medicine *em.Medicine `json:"medicine,omitempty"`
MedicineMix_Id *uint `json:"medicineMix_id"`
MedicineMix *emm.MedicineMix `json:"medicineMix,omitempty"`
@@ -80,7 +80,7 @@ func (d PrescriptionItem) ToResponse() ResponseDto {
Prescription_Id: d.Prescription_Id,
Prescription: d.Prescription,
IsMix: d.IsMix,
Medicine_Id: d.Medicine_Id,
Medicine_Code: d.Medicine_Code,
Medicine: d.Medicine,
MedicineMix_Id: d.MedicineMix_Id,
MedicineMix: d.MedicineMix,
internal/domain/main-entities/prescription-item/entity.go
+1 -2
View File
@@ -14,9 +14,8 @@ type PrescriptionItem struct {
Prescription_Id *uint `json:"prescription_id"`
Prescription *ep.Prescription `json:"prescription,omitempty" gorm:"foreignKey:Prescription_Id;references:Id"`
IsMix bool `json:"isMix"`
Medicine_Id *uint `json:"medicine_id"`
Medicine_Code *string `json:"medicine_code"`
Medicine *em.Medicine `json:"medicine,omitempty" gorm:"foreignKey:Medicine_Id;references:Id"`
Medicine *em.Medicine `json:"medicine,omitempty" gorm:"foreignKey:Medicine_Code;references:Code"`
MedicineMix_Id *uint `json:"medicineMix_id"`
MedicineMix *emm.MedicineMix `json:"medicineMix,omitempty" gorm:"foreignKey:MedicineMix_Id;references:Id"`
Frequency *uint16 `json:"frequency"`