Fixed DICOM FindSCU issues

api.ipsocloud.com/api/v1/Models/PatientInterface.class.php

@@ -487,9 +487,12 @@ namespace Models {
       }
       $conf = json_decode($statement->fetchAll(\PDO::FETCH_ASSOC)[0]['data']);
 
+      $cmdLines = [];
+
       $cmdLine = 'findscu '.$conf->serverAddress.' '.$conf->queryPort.' -aet '.$conf->callingAET.' -aec '.$conf->calledAET.
-        ' -P -k QueryRetrieveLevel="PATIENT" -k PatientID="*" -k PatientName="'.$data['patient'].'*" -k PatientBirthDate="*" -k PatientSex="*"'.
+        ' -P -k QueryRetrieveLevel="PATIENT" -k PatientID="*" -k PatientName="*'.$data['patient'].'*" -k PatientBirthDate="*" -k PatientSex="*"'.
         ' -v 2>&1';
+      $cmdLines[] = $cmdLine;
 
       $output=null;
       $retval=null;
@@ -543,7 +546,7 @@ namespace Models {
       $studies = [];
       foreach($patients as $P) {
         $cmdLine = 'findscu '.$conf->serverAddress.' '.$conf->queryPort.' -aet '.$conf->callingAET.' -aec '.$conf->calledAET.
-          ' -P -k QueryRetrieveLevel="STUDY" -k PatientID="'.$P['PatientID'].'" -k StudyInstanceUID="*" -k StudyID="*" -k StudyDate="*" -k StudyTime="*"'.
+          ' -P -k QueryRetrieveLevel="STUDY" -k PatientID="'.$P['PatientID'].'" -k StudyInstanceUID="" -k StudyID="" -k StudyDate="" -k StudyTime=""'.
           ' -v 2>&1';
 
         $cmdLines[] = $cmdLine;
@@ -609,7 +612,9 @@ namespace Models {
 
       return [
         'studies' => $studies,
-        'result' => 'OK'
+        'studies2' => $studies2, 
+        'result' => 'OK',
+        'cmdLines' => $cmdLines
       ];
     }
     

www.ipsocloud.com/TODO.txt

@@ -15,3 +15,9 @@ Restart service
 
 /etc/init.t/apache2 restart
 
+
+
+
+
+findscu www.dicomserver.co.uk 11112 -aet IIMT -aec IIMT -P -k QueryRetrieveLevel="STUDY" -k PatientName="*" -k PatientID="285285" -k StudyInstanceUID="" -k StudyDate="" -k StudyTime="" -k AccessionNumber="" -k StudyID="" -v 2>&1
+