update All feture and service
This commit is contained in:
No files matched your search
@@ -2,39 +2,43 @@ package clinicalimpression
|
||||
|
||||
import (
|
||||
"time"
|
||||
|
||||
"service/internal/satusehat/common"
|
||||
)
|
||||
|
||||
type ClinicalImpressionRequest struct {
|
||||
OrganizationID string `json:"organization_id,omitempty"`
|
||||
ClinicalImpressionID string `json:"clinical_impression_id,omitempty"`
|
||||
Status string `json:"status" binding:"required,oneof=in-progress completed entered-in-error"`
|
||||
Code *common.CodeableConceptDTO `json:"code,omitempty"`
|
||||
Description string `json:"description,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"`
|
||||
EffectiveDateTime *time.Time `json:"effective_datetime,omitempty"`
|
||||
Date *time.Time `json:"date,omitempty"`
|
||||
AssessorID string `json:"assessor_id,omitempty"`
|
||||
AssessorDisplay string `json:"assessor_display,omitempty"`
|
||||
Problem []common.ReferenceDTO `json:"problem,omitempty"`
|
||||
Investigations []InvestigationDTO `json:"investigations,omitempty"`
|
||||
Summary string `json:"summary,omitempty"`
|
||||
Findings []FindingDTO `json:"findings,omitempty"`
|
||||
Prognosis []*common.CodeableConceptDTO `json:"prognosis,omitempty"`
|
||||
}
|
||||
OrganizationID string `json:"organization_id,omitempty"`
|
||||
ClinicalImpressionID string `json:"clinical_impression_id,omitempty"`
|
||||
|
||||
type InvestigationDTO struct {
|
||||
Code *common.CodeableConceptDTO `json:"code,omitempty"`
|
||||
Item []common.ReferenceDTO `json:"item,omitempty"`
|
||||
}
|
||||
Status string `json:"status" binding:"required,oneof=in-progress completed entered-in-error"`
|
||||
|
||||
type FindingDTO struct {
|
||||
ItemCodeableConcept *common.CodeableConceptDTO `json:"item_codeable_concept,omitempty"`
|
||||
ItemReference *common.ReferenceDTO `json:"item_reference,omitempty"`
|
||||
CodeSystem string `json:"code_system,omitempty"`
|
||||
Code string `json:"code,omitempty"`
|
||||
CodeDisplay string `json:"code_display,omitempty"`
|
||||
|
||||
Description string `json:"description,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"`
|
||||
|
||||
EffectiveDateTime *time.Time `json:"effective_datetime,omitempty"`
|
||||
Date *time.Time `json:"date,omitempty"`
|
||||
|
||||
AssessorID string `json:"assessor_id,omitempty"`
|
||||
AssessorDisplay string `json:"assessor_display,omitempty"`
|
||||
|
||||
ProblemConditionIDs []string `json:"problem_condition_ids,omitempty"`
|
||||
|
||||
Summary string `json:"summary,omitempty"`
|
||||
|
||||
FindingSystem string `json:"finding_system,omitempty"`
|
||||
FindingCode string `json:"finding_code,omitempty"`
|
||||
FindingDisplay string `json:"finding_display,omitempty"`
|
||||
|
||||
PrognosisSystem string `json:"prognosis_system,omitempty"`
|
||||
PrognosisCode string `json:"prognosis_code,omitempty"`
|
||||
PrognosisDisplay string `json:"prognosis_display,omitempty"`
|
||||
}
|
||||
|
||||
type ClinicalImpressionPatchRequest []map[string]interface{}
|
||||
@@ -1,23 +1,18 @@
|
||||
package clinicalimpression
|
||||
|
||||
import (
|
||||
"os"
|
||||
"service/internal/interfaces/satusehat"
|
||||
"time"
|
||||
|
||||
"service/internal/interfaces/satusehat"
|
||||
)
|
||||
|
||||
func MapRequestToFHIR(req ClinicalImpressionRequest) satusehat.FHIRPayload {
|
||||
payload := satusehat.NewFHIRPayload("ClinicalImpression")
|
||||
|
||||
orgID := os.Getenv("SATUSEHAT_ORG_ID")
|
||||
if orgID == "" {
|
||||
orgID = req.OrganizationID
|
||||
}
|
||||
|
||||
if orgID != "" && req.ClinicalImpressionID != "" {
|
||||
if req.OrganizationID != "" && req.ClinicalImpressionID != "" {
|
||||
payload.Set("identifier", []map[string]interface{}{
|
||||
{
|
||||
"system": "http://sys-ids.kemkes.go.id/clinicalimpression/" + orgID,
|
||||
"system": "http://sys-ids.kemkes.go.id/clinicalimpression/" + req.OrganizationID,
|
||||
"use": "official",
|
||||
"value": req.ClinicalImpressionID,
|
||||
},
|
||||
@@ -28,19 +23,17 @@ func MapRequestToFHIR(req ClinicalImpressionRequest) satusehat.FHIRPayload {
|
||||
payload.Set("status", req.Status)
|
||||
}
|
||||
|
||||
if req.Code != nil {
|
||||
sys := req.Code.System
|
||||
if req.Code != "" {
|
||||
sys := req.CodeSystem
|
||||
if sys == "" {
|
||||
sys = "http://snomed.info/sct"
|
||||
}
|
||||
coding := map[string]interface{}{"system": sys, "code": req.Code.Code}
|
||||
if req.Code.Display != "" {
|
||||
coding["display"] = req.Code.Display
|
||||
coding := map[string]interface{}{"system": sys, "code": req.Code}
|
||||
if req.CodeDisplay != "" {
|
||||
coding["display"] = req.CodeDisplay
|
||||
}
|
||||
payload.Set("code", map[string]interface{}{
|
||||
"coding": []map[string]interface{}{
|
||||
coding,
|
||||
},
|
||||
"coding": []map[string]interface{}{coding},
|
||||
})
|
||||
}
|
||||
|
||||
@@ -80,106 +73,44 @@ func MapRequestToFHIR(req ClinicalImpressionRequest) satusehat.FHIRPayload {
|
||||
payload.Set("assessor", assessor)
|
||||
}
|
||||
|
||||
if len(req.Problem) > 0 {
|
||||
var problems []map[string]interface{}
|
||||
for _, p := range req.Problem {
|
||||
problem := map[string]interface{}{"reference": p.Reference}
|
||||
if p.Display != "" {
|
||||
problem["display"] = p.Display
|
||||
}
|
||||
problems = append(problems, problem)
|
||||
if len(req.ProblemConditionIDs) > 0 {
|
||||
problems := make([]map[string]interface{}, 0, len(req.ProblemConditionIDs))
|
||||
for _, id := range req.ProblemConditionIDs {
|
||||
problems = append(problems, map[string]interface{}{"reference": "Condition/" + id})
|
||||
}
|
||||
payload.Set("problem", problems)
|
||||
}
|
||||
|
||||
if len(req.Investigations) > 0 {
|
||||
var investigations []map[string]interface{}
|
||||
for _, inv := range req.Investigations {
|
||||
invObject := map[string]interface{}{}
|
||||
if inv.Code != nil {
|
||||
codeConcept := map[string]interface{}{}
|
||||
sys := inv.Code.System
|
||||
if sys == "" {
|
||||
sys = "http://snomed.info/sct"
|
||||
}
|
||||
coding := map[string]interface{}{"system": sys, "code": inv.Code.Code}
|
||||
if inv.Code.Display != "" {
|
||||
coding["display"] = inv.Code.Display
|
||||
}
|
||||
codeConcept["coding"] = []map[string]interface{}{coding}
|
||||
if inv.Code.Text != "" {
|
||||
codeConcept["text"] = inv.Code.Text
|
||||
}
|
||||
invObject["code"] = codeConcept
|
||||
}
|
||||
|
||||
if len(inv.Item) > 0 {
|
||||
var items []map[string]interface{}
|
||||
for _, item := range inv.Item {
|
||||
ref := map[string]interface{}{"reference": item.Reference}
|
||||
if item.Display != "" {
|
||||
ref["display"] = item.Display
|
||||
}
|
||||
items = append(items, ref)
|
||||
}
|
||||
invObject["item"] = items
|
||||
}
|
||||
investigations = append(investigations, invObject)
|
||||
}
|
||||
payload.Set("investigation", investigations)
|
||||
}
|
||||
|
||||
if req.Summary != "" {
|
||||
payload.Set("summary", req.Summary)
|
||||
}
|
||||
|
||||
if len(req.Findings) > 0 {
|
||||
var findings []map[string]interface{}
|
||||
for _, f := range req.Findings {
|
||||
findingObject := map[string]interface{}{}
|
||||
if f.ItemCodeableConcept != nil {
|
||||
sys := f.ItemCodeableConcept.System
|
||||
if sys == "" {
|
||||
sys = "http://hl7.org/fhir/sid/icd-10"
|
||||
}
|
||||
coding := map[string]interface{}{"system": sys, "code": f.ItemCodeableConcept.Code}
|
||||
if f.ItemCodeableConcept.Display != "" {
|
||||
coding["display"] = f.ItemCodeableConcept.Display
|
||||
}
|
||||
findingObject["itemCodeableConcept"] = map[string]interface{}{
|
||||
"coding": []map[string]interface{}{coding},
|
||||
}
|
||||
}
|
||||
if f.ItemReference != nil {
|
||||
ref := map[string]interface{}{"reference": f.ItemReference.Reference}
|
||||
if f.ItemReference.Display != "" {
|
||||
ref["display"] = f.ItemReference.Display
|
||||
}
|
||||
findingObject["itemReference"] = ref
|
||||
}
|
||||
if len(findingObject) > 0 {
|
||||
findings = append(findings, findingObject)
|
||||
}
|
||||
if req.FindingCode != "" {
|
||||
sys := req.FindingSystem
|
||||
if sys == "" {
|
||||
sys = "http://hl7.org/fhir/sid/icd-10"
|
||||
}
|
||||
payload.Set("finding", findings)
|
||||
coding := map[string]interface{}{"system": sys, "code": req.FindingCode}
|
||||
if req.FindingDisplay != "" {
|
||||
coding["display"] = req.FindingDisplay
|
||||
}
|
||||
payload.Set("finding", []map[string]interface{}{
|
||||
{"itemCodeableConcept": map[string]interface{}{"coding": []map[string]interface{}{coding}}},
|
||||
})
|
||||
}
|
||||
|
||||
if len(req.Prognosis) > 0 {
|
||||
var prognosis []map[string]interface{}
|
||||
for _, p := range req.Prognosis {
|
||||
if p != nil {
|
||||
sys := p.System
|
||||
if sys == "" {
|
||||
sys = "http://snomed.info/sct"
|
||||
}
|
||||
coding := map[string]interface{}{"system": sys, "code": p.Code}
|
||||
if p.Display != "" {
|
||||
coding["display"] = p.Display
|
||||
}
|
||||
prognosis = append(prognosis, map[string]interface{}{"coding": []map[string]interface{}{coding}})
|
||||
}
|
||||
if req.PrognosisCode != "" {
|
||||
sys := req.PrognosisSystem
|
||||
if sys == "" {
|
||||
sys = "http://snomed.info/sct"
|
||||
}
|
||||
payload.Set("prognosisCodeableConcept", prognosis)
|
||||
coding := map[string]interface{}{"system": sys, "code": req.PrognosisCode}
|
||||
if req.PrognosisDisplay != "" {
|
||||
coding["display"] = req.PrognosisDisplay
|
||||
}
|
||||
payload.Set("prognosisCodeableConcept", []map[string]interface{}{
|
||||
{"coding": []map[string]interface{}{coding}},
|
||||
})
|
||||
}
|
||||
|
||||
return payload
|
||||
|
||||
@@ -20,12 +20,8 @@ type repository struct{ client satusehat.SatuSehatClient }
|
||||
|
||||
func NewRepository(client satusehat.SatuSehatClient) Repository { return &repository{client: client} }
|
||||
|
||||
type hiddenCtx struct {
|
||||
context.Context
|
||||
}
|
||||
|
||||
func (r *repository) executeRequest(ctx context.Context, method, endpoint string, req interface{}) (*satusehat.FHIRResponse, error) {
|
||||
resp, err := r.client.DoRequest(hiddenCtx{ctx}, method, endpoint, req)
|
||||
resp, err := r.client.DoRequest(ctx, method, endpoint, req)
|
||||
if err != nil {
|
||||
return nil, errors.InternalError().Message("Failed to execute request to SatuSehat").Cause(err).Build()
|
||||
}
|
||||
|
||||
@@ -14,16 +14,27 @@ type Service interface {
|
||||
GetByID(ctx context.Context, id string) (*satusehat.FHIRResponse, error)
|
||||
Search(ctx context.Context, queryParams url.Values) (*satusehat.FHIRResponse, error)
|
||||
}
|
||||
type service struct{ repo Repository }
|
||||
type service struct {
|
||||
repo Repository
|
||||
orgID string
|
||||
}
|
||||
|
||||
func NewService(repo Repository) Service { return &service{repo: repo} }
|
||||
func NewService(repo Repository, orgID string) Service {
|
||||
return &service{repo: repo, orgID: orgID}
|
||||
}
|
||||
func (s *service) Create(ctx context.Context, req ClinicalImpressionRequest) (*satusehat.FHIRResponse, error) {
|
||||
if req.OrganizationID == "" {
|
||||
req.OrganizationID = s.orgID
|
||||
}
|
||||
return s.repo.Create(ctx, MapRequestToFHIR(req))
|
||||
}
|
||||
func (s *service) Update(ctx context.Context, id string, req ClinicalImpressionRequest) (*satusehat.FHIRResponse, error) {
|
||||
if id == "" {
|
||||
return nil, errors.NewValidationError().Message("ID is required").Build()
|
||||
}
|
||||
if req.OrganizationID == "" {
|
||||
req.OrganizationID = s.orgID
|
||||
}
|
||||
payload := MapRequestToFHIR(req)
|
||||
payload.Set("id", id)
|
||||
return s.repo.Update(ctx, id, payload)
|
||||
|
||||
Reference in New Issue
Block a user