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,36 +2,40 @@ package composition

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

 type CompositionRequest struct {
-	OrganizationID   string                       `json:"organization_id,omitempty"`
-	CompositionID    string                       `json:"composition_id,omitempty"`
-	Status           string                       `json:"status" binding:"required,oneof=preliminary final amended entered-in-error"`
-	Type             *common.CodeableConceptDTO   `json:"type" binding:"required"`
-	Category         []*common.CodeableConceptDTO `json:"category,omitempty"`
-	PatientID        string                       `json:"patient_id" binding:"required"`
-	PatientDisplay   string                       `json:"patient_display,omitempty"`
-	EncounterID      string                       `json:"encounter_id" binding:"required"`
-	EncounterDisplay string                       `json:"encounter_display,omitempty"`
-	Date             *time.Time                   `json:"date" binding:"required"`
-	Author           []common.ReferenceDTO        `json:"author" binding:"required,min=1"`
-	Title            string                       `json:"title" binding:"required"`
-	Sections         []SectionDTO                 `json:"sections,omitempty"`
-}
+	OrganizationID string `json:"organization_id,omitempty"`
+	CompositionID  string `json:"composition_id,omitempty"`

-type SectionDTO struct {
-	Title   string                     `json:"title,omitempty"`
-	Code    *common.CodeableConceptDTO `json:"code,omitempty"`
-	Text    *NarrativeDTO              `json:"text,omitempty"`
-	Entries []common.ReferenceDTO      `json:"entries,omitempty"`
-}
+	Status string `json:"status" binding:"required,oneof=preliminary final amended entered-in-error"`

-type NarrativeDTO struct {
-	Status string `json:"status,omitempty"`
-	Div    string `json:"div,omitempty"`
+	TypeSystem  string `json:"type_system,omitempty"`
+	TypeCode    string `json:"type_code" binding:"required"`
+	TypeDisplay string `json:"type_display,omitempty"`
+
+	CategorySystem  string `json:"category_system,omitempty"`
+	CategoryCode    string `json:"category_code,omitempty"`
+	CategoryDisplay string `json:"category_display,omitempty"`
+
+	PatientID      string `json:"patient_id" binding:"required"`
+	PatientDisplay string `json:"patient_display,omitempty"`
+
+	EncounterID      string `json:"encounter_id" binding:"required"`
+	EncounterDisplay string `json:"encounter_display,omitempty"`
+
+	Date *time.Time `json:"date" binding:"required"`
+
+	AuthorID      string `json:"author_id" binding:"required"`
+	AuthorDisplay string `json:"author_display,omitempty"`
+
+	Title string `json:"title" binding:"required"`
+
+	SectionTitle   string `json:"section_title,omitempty"`
+	SectionSystem  string `json:"section_system,omitempty"`
+	SectionCode    string `json:"section_code,omitempty"`
+	SectionDisplay string `json:"section_display,omitempty"`
+	SectionText    string `json:"section_text,omitempty"`
 }

 type CompositionPatchRequest []map[string]interface{}