diff --git a/cmd/main-migration/migrations/20251111082257.sql b/cmd/main-migration/migrations/20251111082257.sql new file mode 100644 index 00000000..993534c2 --- /dev/null +++ b/cmd/main-migration/migrations/20251111082257.sql @@ -0,0 +1,10 @@ +-- Modify "Medication" table +ALTER TABLE "public"."Medication" DROP CONSTRAINT "fk_Medication_Pharmacist", DROP COLUMN "Pharmacist_Id", ALTER COLUMN "Pharmacist_Code" TYPE character varying(20), ADD CONSTRAINT "fk_Medication_Pharmacist" FOREIGN KEY ("Pharmacist_Code") REFERENCES "public"."Pharmacist" ("Code") ON UPDATE NO ACTION ON DELETE NO ACTION; +-- Modify "MedicationItem" table +ALTER TABLE "public"."MedicationItem" DROP CONSTRAINT "fk_MedicationItem_Medicine", DROP COLUMN "Medicine_Id", ALTER COLUMN "Medicine_Code" TYPE character varying(10), ADD CONSTRAINT "fk_MedicationItem_Medicine" FOREIGN KEY ("Medicine_Code") REFERENCES "public"."Medicine" ("Code") ON UPDATE NO ACTION ON DELETE NO ACTION; +-- Modify "MedicationItemDist" table +ALTER TABLE "public"."MedicationItemDist" DROP CONSTRAINT "fk_MedicationItemDist_Nurse", DROP COLUMN "Nurse_Id", ALTER COLUMN "Nurse_Code" TYPE character varying(20), ADD CONSTRAINT "fk_MedicationItemDist_Nurse" FOREIGN KEY ("Nurse_Code") REFERENCES "public"."Nurse" ("Code") ON UPDATE NO ACTION ON DELETE NO ACTION; +-- Modify "MedicineMixItem" table +ALTER TABLE "public"."MedicineMixItem" DROP CONSTRAINT "fk_MedicineMixItem_Medicine", DROP COLUMN "Medicine_Id", ALTER COLUMN "Medicine_Code" TYPE character varying(10), ADD CONSTRAINT "fk_MedicineMixItem_Medicine" FOREIGN KEY ("Medicine_Code") REFERENCES "public"."Medicine" ("Code") ON UPDATE NO ACTION ON DELETE NO ACTION; +-- Modify "PrescriptionItem" table +ALTER TABLE "public"."PrescriptionItem" DROP CONSTRAINT "fk_PrescriptionItem_Medicine", DROP COLUMN "Medicine_Id", ALTER COLUMN "Medicine_Code" TYPE character varying(10), ADD CONSTRAINT "fk_PrescriptionItem_Medicine" FOREIGN KEY ("Medicine_Code") REFERENCES "public"."Medicine" ("Code") ON UPDATE NO ACTION ON DELETE NO ACTION; diff --git a/cmd/main-migration/migrations/atlas.sum b/cmd/main-migration/migrations/atlas.sum index 7be03ff9..055d8426 100644 --- a/cmd/main-migration/migrations/atlas.sum +++ b/cmd/main-migration/migrations/atlas.sum @@ -1,4 +1,4 @@ -h1:9chFiV9CWBjZHekeODQ1RI3YXRSeFuIJvDtAlbSgq9k= +h1:hjlt7JFxqRt51nzKyLmMo1uueJTYjcyE2zAVvFiHW1E= 20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k= 20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0= 20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI= @@ -75,40 +75,41 @@ h1:9chFiV9CWBjZHekeODQ1RI3YXRSeFuIJvDtAlbSgq9k= 20251106040137.sql h1:ppcqkVoT0o9jZcjI/TN7LuaPxXhJQhnIXEJtloP/46o= 20251106041333.sql h1:2JkxyelQ/EeB+boL5bfpnzefw32ttEGKvKchtQjWmAU= 20251106042006.sql h1:ruppYa1kAJQUU3ufQBbKGMcXrGbGJJiRPclT+dNc/YQ= -20251106050412.sql h1:MiEMJ1HCFYnalKuq3Z38xJeogfBAMqsTv2sG4EF8dDw= -20251106063418.sql h1:y3veDJPjKekOWLCZek/LgQwXPRhZtOppTfUXiqoL95s= -20251106071906.sql h1:/TUZA3XpMY23qEJXdkTwlzrNMvSSl6JJniPcgAttBaw= -20251106073157.sql h1:78txeibJ602DMD7huD618ZSMt6phSRzDNPTlo0PGyrc= -20251106074218.sql h1:8Xz7WywrtUnSxOHhlal53gG9rE7r86LFUt5zBFe/mIs= -20251106081846.sql h1:jp91Bf5bxGXMiUB1VIuN6y768vb2iWwow44WfCE5J5k= -20251106082844.sql h1:RHYzRO4G1fSWwf+xc/3QezZ/Iil67cZPIgNpNz3TNhQ= -20251106090021.sql h1:dFDk6mq+zjbYWmfWIrHf9DiKvvoXHjrr0++zssMTWP8= -20251106144745.sql h1:aHcr23iBFqCHer5D/SsPMXBCLjGqUYvWYfRU8jSJgIw= -20251107012049.sql h1:hu/7NHhnAkT4xK0RNtqmMDdH1Bo5EZbl7itDRjiCT+g= -20251107064812.sql h1:sfCXDQYnMf0ddrQ9oYljWJLLSt9NJjJV6o8VS3p7aZE= -20251107064937.sql h1:DlYGJ9LZFwZyR7jBP5zaGB128aIc4HAixBKPYCz9EkY= -20251107071420.sql h1:ynCdZAd2utLl+FhtWZwtahNXgIVOvuk3s/rOq7lfXA4= -20251107074318.sql h1:WE9cPhibWtZ0dbu1VEGirTeY6ijFYGMNhHdBtM32kOc= -20251107075050.sql h1:8tvneruqdynDOaJK1+0z4CH7YXZStZpGdqwIeOMLik4= -20251107080604.sql h1:8c4jd4Tql7tcdhbI9NS0tgvN+ADu9FnCf8wMUbmW7A0= -20251107081830.sql h1:SAAe3lmsm9vGXuSEsDdl7ad0EAxP5CMmFRDEgp9M7yY= -20251107091033.sql h1:JLdX/u7GUdBfjrPrMSNAqc8HtSoj0YA9iW9Vc6FJZdw= -20251107091209.sql h1:CzhYtwAwT+GHrbqcagnJE+v3mbl/rObf1IJaLCKlzrs= -20251107091541.sql h1:+3ZyWJTftDY2JeWThXuIxGWpUBnyMPyOyY4jBjdWYJI= -20251110012217.sql h1:f4Z8TuGc+XMSJ+Ekn4/PeHRE2FlHWkc5gKPJB0hAX7c= -20251110012306.sql h1:ENPyI6Kjdk6qKJQb0yJ6MCTDPAmO1WD/uhKuCSl+jYo= -20251110052049.sql h1:OrQ0acnyoQLKnTitZfnBcVr5jDslF59OFLaqT7SpdVs= -20251110062042.sql h1:9KwldQt0NpVPR86L0T4hlkfHAGau+7CiZYgu5rF+yhg= -20251110063202.sql h1:A117DuZmZ6U0jWHA3DISnr+yvBjKIr1ObrUr047YezQ= -20251110063633.sql h1:qTiC0F19JnhUIXF4LGJQ21jEV6kKGyhTr1x2kimFqPQ= -20251110085551.sql h1:HZcJM0RSC6HBaUSjKBE8MgDG8Vn9f3LmwA/OnT9Cp7I= -20251110091516.sql h1:W3AQhQLgirEWuCObbLl+Prdrbq6k6EEY1xcoWsmbog4= -20251110091948.sql h1:3tsITMrZr/T+L4wqUMz8sHS229jCJl4T0Nu3dMccxH8= -20251110092729.sql h1:uU+k88RH/e0Ns4/SmJl03RVYPscBAPuiLfxR6CJqaf0= -20251110093522.sql h1:O7upSj8VNjzvroL4IU59bfxKATOkAVGBArcUbVNq9aM= -20251110100258.sql h1://JSArUMNI3/gAtYDx2VN94C198SFW0ANjgs+p6eCRM= -20251110100545.sql h1:ENPOqeJYRpMI4e8VCKwaQgaql8se6pIidAhG2cjskBg= -20251111072601.sql h1:6p2qynJ2vr3C18peYciAbOIWOoj/+PnNcobU3wNHboQ= -20251111073546.sql h1:BORlFReAZTDLUfpS/eIf5qGkJ+FNznMGK47HRiPkfL8= -20251111074148.sql h1:qzjLGQRWo1Gg8LkJFgTb5Ak7h53tdz+eQrpJqC9+Gc0= -20251111074652.sql h1:uuThrt4wjdq4qEbvS67fF0Nfw/dlj7vGnLqywWBznqk= +20251106050412.sql h1:1002KYtHd8AwrQTMewbs/PPHDylHDghigE/3S7PVdMA= +20251106063418.sql h1:jPW/gBnbFl4RO39lQ0ZMDtYA6xbhyD6CgQupT50HmaY= +20251106071906.sql h1:leYGKxR3EQn794aOehf0sd/ZPmOnvBMZPy5/anGmRB4= +20251106073157.sql h1:KASMzjjjk5UB7Zj8lCRtM1utc4ZnDjlnpZbtTe3vONE= +20251106074218.sql h1:Z5q5deOvLaZDPhiVTN9st3/s56RepBa2YOyrMXBdj4A= +20251106081846.sql h1:P+VsWwhGt60adDIZuE/Aa38JVp/yX1rnsdpXpxASodw= +20251106082844.sql h1:Dmi5A8i9frQZvdXYPwc7f8CisZtBH8liSXq1rI6z1iM= +20251106090021.sql h1:4JwdKgO8T46YhyWVJUxpRIwudBDlG8QN1brSOYmgQ20= +20251106144745.sql h1:nqnQCzGrVJaq8ilOEOGXeRUL1dolj+OPWKuP8A92FRA= +20251107012049.sql h1:Pff4UqltGS3clSlGr0qq8CQM56L29wyxY0FC/N/YAhU= +20251107064812.sql h1:GB9a0ZfMYTIoGNmKUG+XcYUsTnRMFfT4/dAD71uCPc4= +20251107064937.sql h1:IC5pw1Ifj30hiE6dr5NMHXaSHoQI+vRd40N5ABgBHRI= +20251107071420.sql h1:9NO3iyLEXEtWa2kSRjM/8LyzuVIk6pdFL2SuheWjB08= +20251107074318.sql h1:7fHbSRrdjOmHh/xwnjCLwoiB5cW5zeH+uxLV0vZbkIA= +20251107075050.sql h1:np+3uTOnU9QNtK7Knaw8eRMhkyB9AwrtSNHphOBxbHY= +20251107080604.sql h1:cXDBLPJDVWLTG6yEJqkJsOQ7p7VYxLM2SY+mwO8qSHo= +20251107081830.sql h1:/S7OQZo4ZnK80t28g/JyiOTZtmWG/dP5Wg2zXNMQ/iE= +20251107091033.sql h1:/cbkF1nO/IjNSIfDJJx456KJtQ9rWFXOBFAkR/M2xiE= +20251107091209.sql h1:jrLQOUeV8ji2fg0pnEcs1bw4ANUxzTSMXC/rrHLIY+M= +20251107091541.sql h1:6UqbhQQRmzA2+eKu5lIvkwOkk+lH70QLZC8Pjpjcq68= +20251110012217.sql h1:C9HpX0iyHzKjyNv/5DSAn2MCHj6MX4p5UQ/NrY7QD0w= +20251110012306.sql h1:J54yb27d30LBbYp9n1P66gFVRlxPguKu0kxmWIBBG8g= +20251110052049.sql h1:232T2x8xTczJl9nk4jxJpZXhoOGYthhxjJ7nK8Jd8vg= +20251110062042.sql h1:WnfVUXrzYoj8qdkkjO9/JQQ8agGd4GfSHQdMjo7LDAg= +20251110063202.sql h1:hSzGfwVMWa6q3vwIQZUkxKgBNCzHjB+6GKy54zfV+oQ= +20251110063633.sql h1:/VpofIAqNS1CnazEnpW/+evbzn9Kew3xDW48r57M+Xg= +20251110085551.sql h1:bFZwSmfvVbTUr/enWB82WqjG88gpqcZ6s45btUvO0uo= +20251110091516.sql h1:KkJMwPQuaZQhiqnKrNQrgP12gw9rV8T3P2o3mtGTcvY= +20251110091948.sql h1:I4odAYrJdvNf1jPw6ppDC0XdI7v6vKBACg/ABwUgA7I= +20251110092729.sql h1:l1out8soEmVP6dNjaIOtGYo6QDcoJZRI8X1sjZ5ZGmo= +20251110093522.sql h1:nsz8jCxGjEdr/bz9g+4ozfZzIP803xONjVmucad1GMc= +20251110100258.sql h1:IBqt1VZj5WjQ+l9aAFGHOCCBtzb03KlLLihFLut7itg= +20251110100545.sql h1:6/LV7751iyKxE2xI6vO1zly+aHUwxXD/IBwLcVpKxqM= +20251111072601.sql h1:lZlTXC8kHh4S+R5TKx23VQDU/Nj2YF+QrDk9Ta2rNM0= +20251111073546.sql h1:nTM5C+HLpBRPkFAsoSJU1RrnzZqoqnrHGvutInHSnCM= +20251111074148.sql h1:U2hX0ICVFut38Qh1s9664QdJFyNF+eutbqd1ryngSy0= +20251111074652.sql h1:KvTPlFQpwGTFLNls/UwA/JNG58ZNAIkiTq9WiO8ttOQ= +20251111082257.sql h1:tSzTg/99dYQKDM1MfIb4QTluZfNeCHytOiWAH1lOd0E= diff --git a/internal/domain/main-entities/medication-item-dist/dto.go b/internal/domain/main-entities/medication-item-dist/dto.go index 6936bdbc..613e87d9 100644 --- a/internal/domain/main-entities/medication-item-dist/dto.go +++ b/internal/domain/main-entities/medication-item-dist/dto.go @@ -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 diff --git a/internal/domain/main-entities/medication-item-dist/entity.go b/internal/domain/main-entities/medication-item-dist/entity.go index 64c732b7..9a1b1f38 100644 --- a/internal/domain/main-entities/medication-item-dist/entity.go +++ b/internal/domain/main-entities/medication-item-dist/entity.go @@ -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"` } diff --git a/internal/domain/main-entities/medication-item/dto.go b/internal/domain/main-entities/medication-item/dto.go index 26a5b35e..636f5c42 100644 --- a/internal/domain/main-entities/medication-item/dto.go +++ b/internal/domain/main-entities/medication-item/dto.go @@ -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, diff --git a/internal/domain/main-entities/medication-item/entity.go b/internal/domain/main-entities/medication-item/entity.go index 88c53ff8..8198afe1 100644 --- a/internal/domain/main-entities/medication-item/entity.go +++ b/internal/domain/main-entities/medication-item/entity.go @@ -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"` diff --git a/internal/domain/main-entities/medication/dto.go b/internal/domain/main-entities/medication/dto.go index 928b926c..67cc284f 100644 --- a/internal/domain/main-entities/medication/dto.go +++ b/internal/domain/main-entities/medication/dto.go @@ -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 diff --git a/internal/domain/main-entities/medication/entity.go b/internal/domain/main-entities/medication/entity.go index 63ceb792..13781f85 100644 --- a/internal/domain/main-entities/medication/entity.go +++ b/internal/domain/main-entities/medication/entity.go @@ -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"` } diff --git a/internal/domain/main-entities/medicine-mix-item/dto.go b/internal/domain/main-entities/medicine-mix-item/dto.go index e834e7ec..12c78500 100644 --- a/internal/domain/main-entities/medicine-mix-item/dto.go +++ b/internal/domain/main-entities/medicine-mix-item/dto.go @@ -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, diff --git a/internal/domain/main-entities/medicine-mix-item/entity.go b/internal/domain/main-entities/medicine-mix-item/entity.go index f0b760f6..3c9d9098 100644 --- a/internal/domain/main-entities/medicine-mix-item/entity.go +++ b/internal/domain/main-entities/medicine-mix-item/entity.go @@ -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"` } diff --git a/internal/domain/main-entities/prescription-item/dto.go b/internal/domain/main-entities/prescription-item/dto.go index 64b5f78f..33e63ed2 100644 --- a/internal/domain/main-entities/prescription-item/dto.go +++ b/internal/domain/main-entities/prescription-item/dto.go @@ -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, diff --git a/internal/domain/main-entities/prescription-item/entity.go b/internal/domain/main-entities/prescription-item/entity.go index 345ad07f..93174079 100644 --- a/internal/domain/main-entities/prescription-item/entity.go +++ b/internal/domain/main-entities/prescription-item/entity.go @@ -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"` diff --git a/internal/use-case/main-use-case/authentication/case.go b/internal/use-case/main-use-case/authentication/case.go index c162c56c..bd9dcee6 100644 --- a/internal/use-case/main-use-case/authentication/case.go +++ b/internal/use-case/main-use-case/authentication/case.go @@ -24,7 +24,9 @@ import ( "simrs-vx/internal/domain/main-entities/intern" em "simrs-vx/internal/domain/main-entities/midwife" en "simrs-vx/internal/domain/main-entities/nurse" + ep "simrs-vx/internal/domain/main-entities/pharmacist" eu "simrs-vx/internal/domain/main-entities/user" + erc "simrs-vx/internal/domain/references/common" erg "simrs-vx/internal/domain/references/organization" ) @@ -169,6 +171,14 @@ func GenToken(input eu.LoginDto) (*d.Data, error) { } atClaims["midwife_code"] = empData.Code outputData["midwife_code"] = empData.Code + case erg.EPCPha: + empData := ep.Pharmacist{} + dg.I.Where("\"Employee_Id\" = ?", employee.Id).First(&empData) + if empData.Id == 0 { + return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-noPharmacist", Message: pl.GenMessage("auth-noPharmacist")}} + } + atClaims["pharmacist_code"] = empData.Code + outputData["pharmacist_code"] = empData.Code } errorGetPosition := d.FieldErrors{"authentication": d.FieldError{Code: "auth-getData-failed", Message: pl.GenMessage("auth-getData-failed")}} diff --git a/internal/use-case/main-use-case/encounter/helper.go b/internal/use-case/main-use-case/encounter/helper.go index 1e86121f..fc69549e 100644 --- a/internal/use-case/main-use-case/encounter/helper.go +++ b/internal/use-case/main-use-case/encounter/helper.go @@ -233,7 +233,7 @@ func createMedicineMixAndItem(input emi.MedicineMix, event *pl.Event, tx *gorm.D for _, medicineMixItem := range input.MixItems { medicineMixItemCreate := emmi.CreateDto{ MedicineMix_Id: &medicineMix.Id, - Medicine_Id: medicineMixItem.Medicine_Id, + Medicine_Code: medicineMixItem.Medicine_Code, Dose: medicineMixItem.Dose, } _, err := ummi.CreateData(medicineMixItemCreate, event, tx) @@ -251,7 +251,7 @@ func createMedicationItem(medication_id uint, input epi.PrescriptionItem, event medicationItemCreate := emei.CreateDto{ Medication_Id: &medication_id, IsMix: input.IsMix, - Medicine_Id: input.Medicine_Id, + Medicine_Code: input.Medicine_Code, MedicineMix_Id: input.MedicineMix_Id, Usage: input.Usage, Interval: input.Interval, diff --git a/internal/use-case/main-use-case/medication-item-dist/case.go b/internal/use-case/main-use-case/medication-item-dist/case.go index ff54c775..ef74fabd 100644 --- a/internal/use-case/main-use-case/medication-item-dist/case.go +++ b/internal/use-case/main-use-case/medication-item-dist/case.go @@ -6,8 +6,6 @@ import ( e "simrs-vx/internal/domain/main-entities/medication-item-dist" - un "simrs-vx/internal/use-case/main-use-case/nurse" - dg "github.com/karincake/apem/db-gorm-pg" d "github.com/karincake/dodol" @@ -303,11 +301,6 @@ func Consume(input e.ConsumeDto) (*d.Data, error) { return pl.SetLogError(&event, input) } - nurse_id, err := un.GetIdByUserId(&input.AuthInfo.User_Id, &event, tx) - if err != nil { - return err - } - if data, err = ReadDetailData(rdDto, &event, tx); err != nil { return err } @@ -319,7 +312,18 @@ func Consume(input e.ConsumeDto) (*d.Data, error) { } data.Remain -= input.Usage - data.Nurse_Id = nurse_id + + if input.AuthInfo.Nurse_Code == nil { + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "auth-noNurse", + Detail: "user position is not allowed, only nurse can do action consume medication", + Raw: errors.New("authentication failed"), + } + return pl.SetLogError(&event, input) + } + + data.Nurse_Code = input.AuthInfo.Nurse_Code if err := tx.Save(&data).Error; err != nil { event.Status = "failed" diff --git a/internal/use-case/main-use-case/medication-item-dist/helper.go b/internal/use-case/main-use-case/medication-item-dist/helper.go index 5b1b1d35..b789f22f 100644 --- a/internal/use-case/main-use-case/medication-item-dist/helper.go +++ b/internal/use-case/main-use-case/medication-item-dist/helper.go @@ -20,5 +20,5 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.MedicationItemDist) data.MedicationItem_Id = inputSrc.MedicationItem_Id data.DateTime = inputSrc.DateTime data.Remain = inputSrc.Remain - data.Nurse_Id = inputSrc.Nurse_Id + data.Nurse_Code = inputSrc.Nurse_Code } diff --git a/internal/use-case/main-use-case/medication-item/helper.go b/internal/use-case/main-use-case/medication-item/helper.go index dcee2cac..5f4cd27b 100644 --- a/internal/use-case/main-use-case/medication-item/helper.go +++ b/internal/use-case/main-use-case/medication-item/helper.go @@ -19,7 +19,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.MedicationItem) { data.Medication_Id = inputSrc.Medication_Id data.IsMix = inputSrc.IsMix - data.Medicine_Id = inputSrc.Medicine_Id + data.Medicine_Code = inputSrc.Medicine_Code data.MedicineMix_Id = inputSrc.MedicineMix_Id data.Frequency = inputSrc.Frequency data.Dose = inputSrc.Dose diff --git a/internal/use-case/main-use-case/medication/case.go b/internal/use-case/main-use-case/medication/case.go index 652f2010..bccbe347 100644 --- a/internal/use-case/main-use-case/medication/case.go +++ b/internal/use-case/main-use-case/medication/case.go @@ -8,8 +8,6 @@ import ( erc "simrs-vx/internal/domain/references/common" - up "simrs-vx/internal/use-case/main-use-case/pharmacist" - dg "github.com/karincake/apem/db-gorm-pg" d "github.com/karincake/dodol" @@ -313,13 +311,18 @@ func Complete(input e.ReadDetailDto) (*d.Data, error) { return pl.SetLogError(&event, input) } - pharmacist_id, err := up.GetIdByUserId(&input.AuthInfo.User_Id, &event, tx) - if err != nil { - return err + if input.AuthInfo.Pharmachist_Code == nil { + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "auth-noPharmacist", + Detail: "user position is not allowed, only pharmacist can do actioncomplete medication", + Raw: errors.New("authentication failed"), + } + return pl.SetLogError(&event, input) } data.Status_Code = erc.DSCDone - data.Pharmacist_Id = pharmacist_id + data.Pharmacist_Code = input.AuthInfo.Pharmachist_Code if err := tx.Save(&data).Error; err != nil { event.Status = "failed" event.ErrInfo = pl.ErrorInfo{ diff --git a/internal/use-case/main-use-case/medication/helper.go b/internal/use-case/main-use-case/medication/helper.go index 63290cb1..b9d0d508 100644 --- a/internal/use-case/main-use-case/medication/helper.go +++ b/internal/use-case/main-use-case/medication/helper.go @@ -30,7 +30,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Medication) { data.Encounter_Id = inputSrc.Encounter_Id data.IssuedAt = inputSrc.IssuedAt - data.Pharmacist_Id = inputSrc.Pharmacist_Id + data.Pharmacist_Code = inputSrc.Pharmacist_Code data.Status_Code = inputSrc.Status_Code } diff --git a/internal/use-case/main-use-case/medicine-mix-item/helper.go b/internal/use-case/main-use-case/medicine-mix-item/helper.go index 0a64f30c..597cee66 100644 --- a/internal/use-case/main-use-case/medicine-mix-item/helper.go +++ b/internal/use-case/main-use-case/medicine-mix-item/helper.go @@ -18,7 +18,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.MedicineMixItem) { } data.MedicineMix_Id = inputSrc.MedicineMix_Id - data.Medicine_Id = inputSrc.Medicine_Id + data.Medicine_Code = inputSrc.Medicine_Code data.Dose = inputSrc.Dose data.Note = inputSrc.Note } diff --git a/internal/use-case/main-use-case/prescription-item/helper.go b/internal/use-case/main-use-case/prescription-item/helper.go index 3f627ddf..174e9927 100644 --- a/internal/use-case/main-use-case/prescription-item/helper.go +++ b/internal/use-case/main-use-case/prescription-item/helper.go @@ -19,7 +19,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.PrescriptionItem) { data.Prescription_Id = inputSrc.Prescription_Id data.IsMix = inputSrc.IsMix - data.Medicine_Id = inputSrc.Medicine_Id + data.Medicine_Code = inputSrc.Medicine_Code data.MedicineMix_Id = inputSrc.MedicineMix_Id data.Frequency = inputSrc.Frequency data.Dose = inputSrc.Dose diff --git a/internal/use-case/main-use-case/prescription/helper.go b/internal/use-case/main-use-case/prescription/helper.go index 7260699e..0a10ae05 100644 --- a/internal/use-case/main-use-case/prescription/helper.go +++ b/internal/use-case/main-use-case/prescription/helper.go @@ -99,7 +99,7 @@ func createMedicineMixAndItem(input emi.MedicineMix, event *pl.Event, tx *gorm.D for _, medicineMixItem := range input.MixItems { medicineMixItemCreate := emmi.CreateDto{ MedicineMix_Id: &medicineMix.Id, - Medicine_Id: medicineMixItem.Medicine_Id, + Medicine_Code: medicineMixItem.Medicine_Code, Dose: medicineMixItem.Dose, } _, err := ummi.CreateData(medicineMixItemCreate, event, tx) @@ -117,7 +117,7 @@ func createMedicationItem(medication_id uint, input epi.PrescriptionItem, event medicationItemCreate := emei.CreateDto{ Medication_Id: &medication_id, IsMix: input.IsMix, - Medicine_Id: input.Medicine_Id, + Medicine_Code: input.Medicine_Code, MedicineMix_Id: input.MedicineMix_Id, Frequency: input.Frequency, Dose: input.Dose,