diff --git a/dvzaservice/main.go b/dvzaservice/main.go index 4cabe58..15c689a 100644 --- a/dvzaservice/main.go +++ b/dvzaservice/main.go @@ -55,20 +55,9 @@ func loadCert() *tls.Certificate { func loadKeyPair() credentials.TransportCredentials { certificate := loadCert() - // data, err := ioutil.ReadFile("certs/ca.crt") - // if err != nil { - // panic("failed to load CA file: " + err.Error()) - // } - - // capool := x509.NewCertPool() - // if !capool.AppendCertsFromPEM(data) { - // panic("can't add ca cert") - // } - tlsConfig := &tls.Config{ ClientAuth: tls.RequestClientCert, Certificates: []tls.Certificate{*certificate}, - // ClientCAs: capool, } return credentials.NewTLS(tlsConfig) } diff --git a/extbin/ediviewer b/extbin/ediviewer deleted file mode 100755 index f66c312..0000000 Binary files a/extbin/ediviewer and /dev/null differ diff --git a/extbin/medeur.json b/extbin/medeur.json deleted file mode 100644 index be2c6fd..0000000 --- a/extbin/medeur.json +++ /dev/null @@ -1 +0,0 @@ -{"format":[{"name":"UNB","description":"Interchange header"},{"name":"UNH","description":"Head of message"},{"name":"BGM","children":[{"name":"DTM","description":"Datum aangemaakt"},{"name":"RFF","description":"Referenties"},{"name":"FTX","description":"Bericht afhankelijke mededeling"}],"description":"Begin van het bericht"},{"name":"S01","children":[{"name":"NAD","description":"Naam en adres"},{"name":"ADR","description":"Adres"},{"name":"COM","description":"Telefoon- en fax-nummers"},{"name":"RFF"},{"name":"DTM"},{"name":"LAN"},{"name":"SPR","description":"Type medewerker"},{"name":"QUA","description":"Kwalificatie"},{"name":"FTX","description":"Vrije tekst"}],"description":"Medebehandelaar"},{"name":"S02","children":[{"name":"PNA","description":"Naam van de patient"},{"name":"ADR","description":"Adres-patient"},{"name":"COM","description":"Telefoon- en fax-nummers"},{"name":"RFF","description":"Referenties"},{"name":"DTM","description":"Tijdsindicatie"},{"name":"NAT"},{"name":"LAN"},{"name":"LOC"},{"name":"PDI","description":"Demografische gegevens"},{"name":"QUA","description":"Kwalificatie"},{"name":"STS"},{"name":"INS","description":"Verzekeringsgegevens"},{"name":"REL"},{"name":"FTX","description":"Vrije tekst"},{"name":"S03","children":[{"name":"DTM","description":"Tijdsindicatie"},{"name":"S04","children":[{"name":"CIN","description":"Diagnose signalering of risico-factor"},{"name":"PTY","description":"Prioriteit"},{"name":"RFF","description":"Referentie naar groep 1"},{"name":"FTX","description":"Vrije tekst"},{"name":"DTM","description":"Tijdsindicatie"}],"description":"Medisch kenmerk"},{"name":"S05","children":[{"name":"INV"},{"name":"DTM"}]}],"description":"Contact onafhankelijke medische gegevens"},{"name":"S06","children":[{"name":"DTM","description":"Datum/tijd van een contact"},{"name":"RFF","description":"Verantwoordelijke persoon"},{"name":"S07","children":[{"name":"FTX"},{"name":"PTY","description":"Prioriteit"},{"name":"RFF","description":"Probleem/episode"},{"name":"DTM","description":"Datum/tijd van een contact"}],"description":"Ongeclassificeerde journaalregel"},{"name":"S08","children":[{"name":"INV","description":"Meting identificatie"},{"name":"PTY","description":"Prioriteit"},{"name":"RFF","description":"Probleem/episode"},{"name":"RSL","description":"Resultaat meting"},{"name":"RND","description":"Normaalwaarden"},{"name":"FTX","description":"Resultaat"},{"name":"DTM","description":"Datum/tijd"}],"description":"Metingen"},{"name":"S09","children":[{"name":"CIN","description":"Diagnose"},{"name":"PTY","description":"Prioriteit"},{"name":"RFF","description":"Probleem/episode"},{"name":"FTX","description":"Diagnose in vrije tekst"},{"name":"DTM","description":"Datum/tijd"}],"description":"Diagnoses"},{"name":"S10","children":[{"name":"SPR","description":"Specialisme"},{"name":"PTY","description":"Prioriteit"},{"name":"RFF","description":"Probleem/episode"},{"name":"PRC","description":"Soort verwijzing"},{"name":"FTX","description":"Beschrijving"},{"name":"DTM","description":"Datum/tijd"}],"description":"Verwijzingen of terugverwijzingen"},{"name":"S11","children":[{"name":"CLI","description":"Type therapie"},{"name":"PTY","description":"Prioriteit"},{"name":"RFF","description":"Probleem/episode"},{"name":"FTX","description":"Vrije tekst"},{"name":"QTY","description":"Hoeveelheid"},{"name":"DNL","children":[{"name":"DSG","description":"Dose administration"},{"name":"FTX","description":"Vrije tekst"}],"description":"Dosering Nederlandse stijl"},{"name":"SPC","children":[{"name":"QTY","description":"Hoeveelheid"}],"description":"Afzonderlijke stoffen van recept"},{"name":"CIN","description":"Indicatie"},{"name":"SPR","description":"Specialisme voorschrijver"},{"name":"DTM","description":"Datum/tijd"}],"description":"Therapie"}],"description":"Journaalregel"}],"description":"Pati\u00ebnt"},{"name":"UNT","description":"Einde van het bericht"},{"name":"UNZ","description":"Einde uitwisseling"}]} \ No newline at end of file diff --git a/extbin/template.html b/extbin/template.html deleted file mode 100644 index 11295f7..0000000 --- a/extbin/template.html +++ /dev/null @@ -1,520 +0,0 @@ - - -{{.Patient.Name}} — MEDEUR - - - -
- -{{define "person-row"}} - - {{if .Name}}{{.Name}}{{else}}Geen naam{{end}} - {{.Function}} - {{.Address}} - {{if .AGB}}AGB: {{.AGB}}{{end}} - {{end}} - -{{define "medi-group-epi"}} - {{$root := .}} - - - - - {{if HasEndDates .Episodes }} - - {{end}} - - - - {{if eq .Extra.verbose_icpc_description "true"}} - - {{else}} - {{end}} - - - - - {{range .Episodes}} - - - - {{if HasEndDates $.Episodes }} - - {{end}} - - - - - {{if eq $root.Extra.verbose_icpc_description "true"}} - - - {{else}} - {{if eq .Description ""}} - - {{else}} - - {{end}} - {{end}} - - {{end}} - -
DatumEinddatumTypeICPCBeschrijvingBeschrijving arts
{{.Date}}{{.EndDate}}{{.Type}}{{.ICPC}}{{.Title}}{{.Description}}{{.Title}}{{.Description}}
-{{end}} - -{{define "medi-group-ica"}} - {{$root := .}} - - - - - - - - {{if eq $root.Extra.verbose_icpc_description "true"}} - - {{else}} - {{end}} - - - - {{range .Indicators}} - - - - - - {{if eq $root.Extra.verbose_icpc_description "true"}} - - {{else}} - - {{end}} - {{end}} - -
DatumTypeICPCBeschrijving
{{.Date}}{{.Type}}{{.ICPC}}{{.Title}}{{.Description}}
- {{end}} - -
-

Huisarts

- - {{template "person-row" .GP}} - {{if .Pharmacy.Anchor}}{{template "person-row" .Pharmacy}}{{end}} -
- -{{if .Practitioners}} -

Medebehandelaren

-
- {{range .Practitioners}} - {{template "person-row" .}}{{end}} -
-
-{{end}} - -
- -
-

Patiënt

- - - - - - - - -
Naam: - {{.Patient.Name}} - {{if .Patient.BSN}} -
BSN: - {{.Patient.BSN}} - {{end}} -
Geboortedatum: - {{.Patient.Birthdate}} -
Adres: - {{.Patient.Address}} -
Geslacht: - {{.Patient.Gender}} - {{range .Patient.OtherFields}} -
{{.Key}}: - {{.Value}} - {{end}} -
-
- -{{if .Memo}} -
-

Memo

- {{.Memo}} -
-{{end}} - -{{if .Episodes}} -
-

Episodelijst

- {{template "medi-group-epi" .}} -
-{{end}} - -{{if .Indicators}} -
-

Contra-indicaties, interacties en allergieën

-{{template "medi-group-ica" .}} -
-{{end}} - -{{if .Medication}} -
-

Medicatieoverzicht

- - - - - - - - - - - - {{range $index, $med := .Medication}} - {{if gt (len $med.Fold) 1}} - - - - - - - - {{range $fold := $med.Fold}} - - - - - - - - {{end}} - {{else}} - - - - - - - - {{end}} - {{end }} - -
ReceptGebruiksvoorschriftHoeveelheidIngangVervalt
{{$med.Recipe}}{{$med.Instructions}}{{ YieldDosage $med }}{{$med.StartDate}}{{$med.EndDate}}
{{ if ne $med.Instructions $fold.Instructions}}{{$fold.Instructions}}{{else}}{{end}}{{ YieldDosage $fold }}{{$fold.StartDate}}{{$fold.EndDate}}
{{$med.Recipe}}{{$med.Instructions}}{{ YieldDosage $med }}{{$med.StartDate}}{{$med.EndDate}}
-
-{{end}} - -{{if .Journal}} -
-

Journaal

-
- -{{range .Journal}} -
-
{{.Date}}
-
- - {{if .Results}} -
- - - - - - - - - - {{range .Results}} - - - - - {{end}} - -
IdentificatieResultaatBeschrijving
{{.Kind}}{{.Result}}{{if eq .Identification "Buiten normaalwaarde"}}{{.Identification}}{{else}}{{.Identification}}{{end}} - {{if and .Identification .Description}}
{{end}} - {{.Description}} -
-
- {{end}} - - {{range .Lines}} -
- - - - {{if .SOEP}} - -
{{.SOEP}}: - {{ConvertLinebreaks .Text}} - {{end}} - {{if .Kind}} - {{.Kind}}{{if .Text}}:{{end}} - {{ConvertLinebreaks .Text}} - {{end}} -
- -
- {{end}} -
-
-{{end}} -{{end}} - -{{if .Extra.csrf_token }} -
-
- -

- - -
-{{end}} - -
- diff --git a/his/openapiclient.go b/his/openapiclient.go index 025b0c6..23f1392 100644 --- a/his/openapiclient.go +++ b/his/openapiclient.go @@ -40,7 +40,6 @@ func getUnauthenticatedClient(addr string) (okapi.OkAPIClient, error) { return nil, err } - // defer serviceProvider.Close() return okapi.NewOkAPIClient(conn), nil } diff --git a/his/srv.go b/his/srv.go index b998b3f..2bc13d6 100644 --- a/his/srv.go +++ b/his/srv.go @@ -61,7 +61,6 @@ func loadKeyPair() credentials.TransportCredentials { tlsConfig := &tls.Config{ ClientAuth: tls.RequestClientCert, Certificates: []tls.Certificate{*certificate}, - // ClientCAs: capool, } return credentials.NewTLS(tlsConfig) } @@ -265,6 +264,7 @@ func (srv *HISServer) Authenticate(c *gin.Context) { raw := "" method := "" + if len(c.Request.TLS.PeerCertificates) > 0 { jwk, err := cryptoutil.PublicKeyToJWK(c.Request.TLS.PeerCertificates[0].PublicKey) diff --git a/whiteboxservice/main.go b/whiteboxservice/main.go index 046ed6a..1fd7a18 100644 --- a/whiteboxservice/main.go +++ b/whiteboxservice/main.go @@ -60,7 +60,6 @@ func loadKeyPair() credentials.TransportCredentials { tlsConfig := &tls.Config{ ClientAuth: tls.RequestClientCert, Certificates: []tls.Certificate{*certificate}, - // ClientCAs: capool, } return credentials.NewTLS(tlsConfig) }