Merge remote-tracking branch 'upstream/main'

internal/satusehat/usecase/servicerequest/dto.go

@@ -15,6 +15,7 @@ type ServiceRequestRequest struct {
 	Status        string    `json:"status,omitempty" binding:"omitempty,oneof=draft active on-hold revoked completed entered-in-error unknown"`
 	Intent        string    `json:"intent,omitempty" binding:"omitempty,oneof=proposal plan directive order original-order reflex-order filler-order instance-order option"`
 	Code          string    `json:"code,omitempty"`
+	System        string    `json:"system,omitempty"`
 	Display       string    `json:"display,omitempty"`
 	AuthoredOn    time.Time `json:"authored_on,omitempty"`
 }

internal/satusehat/usecase/servicerequest/mapper.go

@@ -28,8 +28,12 @@ func MapRequestToFHIR(req ServiceRequestRequest) satusehat.FHIRPayload {
 	}
 
 	if req.Code != "" {
+		system := "http://snomed.info/sct"
+		if req.System != "" {
+			system = req.System
+		}
 		coding := map[string]interface{}{
-			"system": "http://snomed.info/sct",
+			"system": system,
 			"code":   req.Code,
 		}
 		if req.Display != "" {