Merge pull request #47 from CCC-MF/issue_46

Issue #46: Verwende ECOG-Status Datum "as is"

2 files changed, 16 insertions, 13 deletions

diff --git a/examples/uf-einzelempfehlung/klinik_anamnese-getEcogStatus.js b/examples/uf-einzelempfehlung/klinik_anamnese-getEcogStatus.js
index 02a2fea..763b683 100644
--- a/examples/uf-einzelempfehlung/klinik_anamnese-getEcogStatus.js
+++ b/examples/uf-einzelempfehlung/klinik_anamnese-getEcogStatus.js
@@ -13,15 +13,18 @@ executePluginMethod('DNPMHelper', 'getEcogStatus', {PatientId: getPatient().id},
             return;
         }
 
-        let uf = resp.result.map(item => {
-            let date = new Date(item.date).toISOString().split('T')[0];
-            let ecog = [];
-            ecog.val = item.status;
-            ecog.version = version;
-            return {
-                Datum: [date, 'exact'], ECOG: ecog
-            };
-        });
+        let uf = resp.result
+            .map(item => {
+                let date = item.date.match(/^\d{4}-\d{2}-\d{2}/);
+                let ecog = [];
+                ecog.val = item.status;
+                ecog.version = version;
+                return {
+                    Datum: [date ? date[0] : null, 'exact'], ECOG: ecog
+                };
+            })
+            // Ignore items without valid values
+            .filter(item => item.Datum[0] && (item.ECOG >= 0 && item.ECOG <= 5));
         setFieldValue('ECOGVerlauf', uf);
     }
 }, false);
\ No newline at end of file
diff --git a/forms/dnpm-formulare.osc b/forms/dnpm-formulare.osc
index 0181101..11fbcdd 100644
--- a/forms/dnpm-formulare.osc
+++ b/forms/dnpm-formulare.osc
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <OnkostarEditor>
   <InfoXML>
-    <DatumXML>2023-09-01Z</DatumXML>
+    <DatumXML>2023-09-25Z</DatumXML>
     <Name>OnkoStar</Name>
     <Version>2.11.1.6</Version>
   </InfoXML>
@@ -10035,7 +10035,7 @@
         <Valid>true</Valid>
       </ScriptBeimSpeichern>
       <ScriptBeimNeuanlegen>
-        <Code>patient = getPatient();&amp;#10;setFieldValue('Geburtsdatum', patient.geburtsdatum);&amp;#10;setFieldValue('Todesdatum', patient.sterbedatum);&amp;#10;setFieldValue('Geschlecht', patient.geschlecht);&amp;#10;setFieldValue('Krankenkasse', patient.krankenkassennummer);&amp;#10;&amp;#10;erkrankung = getCurrentDisease();&amp;#10;setFieldValue('DatumErstdiagnose', erkrankung.diagnosisDate);&amp;#10;setFieldVersion('ICDO3Lokalisation', erkrankung.diagnosisDate)&amp;#10;setFieldValue('ICDO3Lokalisation', erkrankung.localisationCode);&amp;#10;setFieldVersion('ICDO3Histologie', erkrankung.diagnosisDate)&amp;#10;setFieldValue('ICDO3Histologie', erkrankung.histologyCode);&amp;#10;setFieldVersion('ICD10', erkrankung.diagnosisDate)&amp;#10;setFieldValue('ICD10', erkrankung.icd10Code);&amp;#10;&amp;#10;executePluginMethod('DNPMHelper', 'getSystemischeTherapienFromDiagnose', {'DiagnoseId': getCurrentDisease().id},&amp;#10;function(result) {&amp;#10; setFieldValue('DNPMTherapielinie', result.result);&amp;#10; for (var i = 0; i &lt;= result.result.length; i++) setSubformFieldValue('Nummer', i, i) &amp;#10;}, true);&amp;#10;&amp;#10;executePluginMethod('DNPMHelper', 'getEcogStatus', {PatientId: getPatient().id}, (resp) =&gt; {&amp;#10; if (resp.status.code === 1) {&amp;#10; // Hack: Get version id of ECOG status as stored in Database&amp;#10; // by using initial empty entry and its version.&amp;#10; // Since OS always creates an initial empty entry for subforms&amp;#10; // this can be used to get required version id from within a form script.&amp;#10; let version = getFieldValue('ECOGVerlauf')[0].ECOG.version;&amp;#10;&amp;#10; // Abort if no version available.&amp;#10; if (version == null) {&amp;#10; return;&amp;#10; }&amp;#10;&amp;#10; let uf = resp.result.map(item =&gt; {&amp;#10; let date = new Date(item.date).toISOString().split('T')[0];&amp;#10; let ecog = [];&amp;#10; ecog.val = item.status;&amp;#10; ecog.version = version;&amp;#10; return {&amp;#10; Datum: [date, 'exact'], ECOG: ecog&amp;#10; };&amp;#10; });&amp;#10; setFieldValue('ECOGVerlauf', uf);&amp;#10; }&amp;#10;}, false);</Code>
+        <Code>patient = getPatient();&amp;#10;setFieldValue('Geburtsdatum', patient.geburtsdatum);&amp;#10;setFieldValue('Todesdatum', patient.sterbedatum);&amp;#10;setFieldValue('Geschlecht', patient.geschlecht);&amp;#10;setFieldValue('Krankenkasse', patient.krankenkassennummer);&amp;#10;&amp;#10;erkrankung = getCurrentDisease();&amp;#10;setFieldValue('DatumErstdiagnose', erkrankung.diagnosisDate);&amp;#10;setFieldVersion('ICDO3Lokalisation', erkrankung.diagnosisDate)&amp;#10;setFieldValue('ICDO3Lokalisation', erkrankung.localisationCode);&amp;#10;setFieldVersion('ICDO3Histologie', erkrankung.diagnosisDate)&amp;#10;setFieldValue('ICDO3Histologie', erkrankung.histologyCode);&amp;#10;setFieldVersion('ICD10', erkrankung.diagnosisDate)&amp;#10;setFieldValue('ICD10', erkrankung.icd10Code);&amp;#10;&amp;#10;executePluginMethod('DNPMHelper', 'getSystemischeTherapienFromDiagnose', {'DiagnoseId': getCurrentDisease().id},&amp;#10;function(result) {&amp;#10; setFieldValue('DNPMTherapielinie', result.result);&amp;#10; for (var i = 0; i &lt;= result.result.length; i++) setSubformFieldValue('Nummer', i, i) &amp;#10;}, true);&amp;#10;&amp;#10;executePluginMethod('DNPMHelper', 'getEcogStatus', {PatientId: getPatient().id}, (resp) =&gt; {&amp;#10; if (resp.status.code === 1) {&amp;#10; // Hack: Get version id of ECOG status as stored in Database&amp;#10; // by using initial empty entry and its version.&amp;#10; // Since OS always creates an initial empty entry for subforms&amp;#10; // this can be used to get required version id from within a form script.&amp;#10; let version = getFieldValue('ECOGVerlauf')[0].ECOG.version;&amp;#10;&amp;#10; // Abort if no version available.&amp;#10; if (version == null) {&amp;#10; return;&amp;#10; }&amp;#10;&amp;#10; let uf = resp.result&amp;#10; .map(item =&gt; {&amp;#10; let date = item.date.match(/^\d{4}-\d{2}-\d{2}/);&amp;#10; let ecog = [];&amp;#10; ecog.val = item.status;&amp;#10; ecog.version = version;&amp;#10; return {&amp;#10; Datum: [date ? date[0] : null, 'exact'], ECOG: ecog&amp;#10; };&amp;#10; })&amp;#10; // Ignore items without valid values&amp;#10; .filter(item =&gt; item.Datum[0] &amp;&amp; (item.ECOG &gt;= 0 &amp;&amp; item.ECOG &lt;= 5));&amp;#10; setFieldValue('ECOGVerlauf', uf);&amp;#10; }&amp;#10;}, false);</Code>
         <Valid>true</Valid>
       </ScriptBeimNeuanlegen>
       <ScriptBeimBearbeiten>
@@ -10044,7 +10044,7 @@
       </ScriptBeimBearbeiten>
       <SID>20119</SID>
       <GUID>d2689561-8119-4907-b2e3-ce63e5fafef0</GUID>
-      <Revision>222</Revision>
+      <Revision>223</Revision>
       <SeitenzahlSichtbar>true</SeitenzahlSichtbar>
       <Entries>
         <Entry parentRefId="10316">
@@ -18977,4 +18977,4 @@
       </Ordner>
     </DataForm>
   </Editor>
-</OnkostarEditor>
\ No newline at end of file
+</OnkostarEditor>