update All feture and service

2026-06-03 02:54:26 +00:00
parent af32d9cfdd
commit ce0fa1a291
98 changed files with 272469 additions and 1606 deletions
@@ -2,25 +2,44 @@ package procedure

 import (
 	"time"
-
-	"service/internal/satusehat/common"
 )

 type ProcedureRequest struct {
-	OrganizationID    string                       `json:"organization_id,omitempty"`
-	ProcedureID       string                       `json:"procedure_id,omitempty"`
-	Status            string                       `json:"status" binding:"required,oneof=preparation in-progress not-done on-hold stopped completed entered-in-error unknown"`
-	Category          []*common.CodeableConceptDTO `json:"category,omitempty"`
-	Code              *common.CodeableConceptDTO   `json:"code" binding:"required"`
-	Subject           *common.ReferenceDTO         `json:"subject" binding:"required"`
-	Encounter         *common.ReferenceDTO         `json:"encounter,omitempty"`
-	PerformedDateTime *time.Time                   `json:"performed_date_time,omitempty"`
-	PerformedStart    *time.Time                   `json:"performed_start,omitempty"`
-	PerformedEnd      *time.Time                   `json:"performed_end,omitempty"`
-	Performer         []common.ReferenceDTO        `json:"performer,omitempty"`
-	ReasonCode        []*common.CodeableConceptDTO `json:"reason_code,omitempty"`
-	BodySite          []*common.CodeableConceptDTO `json:"body_site,omitempty"`
-	Note              []string                     `json:"note,omitempty"`
+	OrganizationID string `json:"organization_id,omitempty"`
+	ProcedureID    string `json:"procedure_id,omitempty"`
+
+	Status string `json:"status" binding:"required,oneof=preparation in-progress not-done on-hold stopped completed entered-in-error unknown"`
+
+	CategoryCode    string `json:"category_code,omitempty"`
+	CategoryDisplay string `json:"category_display,omitempty"`
+	CategorySystem  string `json:"category_system,omitempty"`
+
+	CodeSystem  string `json:"code_system,omitempty"`
+	Code        string `json:"code" binding:"required"`
+	CodeDisplay string `json:"code_display,omitempty"`
+
+	PatientID   string `json:"patient_id" binding:"required"`
+	PatientName string `json:"patient_name,omitempty"`
+
+	EncounterID      string `json:"encounter_id,omitempty"`
+	EncounterDisplay string `json:"encounter_display,omitempty"`
+
+	PerformedDateTime *time.Time `json:"performed_date_time,omitempty"`
+	PerformedStart    *time.Time `json:"performed_start,omitempty"`
+	PerformedEnd      *time.Time `json:"performed_end,omitempty"`
+
+	PerformerID   string `json:"performer_id,omitempty"`
+	PerformerName string `json:"performer_name,omitempty"`
+
+	ReasonCode    string `json:"reason_code,omitempty"`
+	ReasonDisplay string `json:"reason_display,omitempty"`
+	ReasonSystem  string `json:"reason_system,omitempty"`
+
+	BodySiteCode    string `json:"body_site_code,omitempty"`
+	BodySiteDisplay string `json:"body_site_display,omitempty"`
+	BodySiteSystem  string `json:"body_site_system,omitempty"`
+
+	Note string `json:"note,omitempty"`
 }

 type ProcedurePatchRequest []map[string]interface{}