From 6c86c39833d918ea82b458fe0afad24b6b1c4eea Mon Sep 17 00:00:00 2001
From: vinish <vinish@zhservices.com>
Date: Wed, 12 Oct 2011 11:29:50 +0530
Subject: [PATCH] erx fix 4

Signed-off-by: vinish <vinish@zhservices.com>
---
 interface/eRx.php                                  | 43 +++++++++++--
 interface/eRx_xml.php                              | 72 ++++++++++++++++------
 interface/patient_file/summary/add_edit_issue.php  |  3 +-
 interface/patient_file/summary/stats.php           |  9 ++-
 interface/patient_file/summary/stats_full.php      | 13 ++--
 interface/soap_functions/soap_allergy.php          | 51 +++++++++++++--
 .../soap_functions/soap_patientfullmedication.php  | 18 ++++--
 templates/prescription/general_list.html           | 10 ++-
 8 files changed, 174 insertions(+), 45 deletions(-)

diff --git a/interface/eRx.php b/interface/eRx.php
index e5ddf5848..b40b538a4 100644
--- a/interface/eRx.php
+++ b/interface/eRx.php
@@ -36,6 +36,8 @@ require('eRx_xml.php');
 $userRole=sqlQuery("select * from users where username=?",array($_SESSION['authUser']));
 $userRole['newcrop_user_role'] = preg_replace('/erx/','',$userRole['newcrop_user_role']);
 $msg='';
+$warning_msg='';
+$dem_check='';
 $doc = new DOMDocument();
 $doc->formatOutput = true;
 $GLOBALS['total_count']=60;
@@ -73,7 +75,7 @@ if($userRole['newcrop_user_role']=='midlevelPrescriber')
 $prescIds='';
 if($pid)
 {
-    Patient($doc,$r,$pid);
+    $allergy=Patient($doc,$r,$pid);
     $active = '';
     if($GLOBALS['erx_upload_active']==1)
         $active = 'and active=1';    
@@ -102,19 +104,40 @@ if($pid)
         OutsidePrescription($doc,$r,$pid,0);
     }    
     if($res_presc<$GLOBALS['total_count'])
-    PatientMedication($doc,$r,$pid,$med_limit);
+    $uploaded_med_arr =PatientMedication($doc,$r,$pid,$med_limit);
 }
 $xml = $doc->saveXML();
 $xml = preg_replace('/"/',"'",$xml);
 //echo $xml."<br><br>";
-$xml = stripStrings($xml,array('&#xD;'=>'','\t'=>'','\r'=>'','\n'=>''));
+$xml = stripStrings($xml,array('&#xD;'=>'','\t'=>''));
+//$xml = stripStrings($xml,array('&#xD;'=>'','\t'=>'','\r'=>'','\n'=>''));
+if($dem_check){
+    echo "<b>".htmlspecialchars( xl("Warning:"), ENT_NOQUOTES)."</b><br><br>";
+    echo $dem_check."<br>";
+    echo htmlspecialchars( xl("The page will be redirected to Demographics. You can edit the country field and clickthrough to NewCrop again."), ENT_NOQUOTES);
+    ob_end_flush();
+    ?>
+    <script type="text/javascript">
+    window.setTimeout(function nav(){
+        window.location="patient_file/summary/demographics_full.php";
+    },5000);
+    </script>
+    <?php
+    die;
+}
 if($msg)
 {
     echo htmlspecialchars( xl('The following fields have to be filled to send request.'), ENT_NOQUOTES);
     echo "<br>";
-    echo $msg;
+    echo $msg;    
     die;
 }
+if($warning_msg)
+{    
+    echo "<font style='font-weight:bold;font-size:15px'>".htmlspecialchars( xl("Warning : "), ENT_NOQUOTES)."</font><br>".$warning_msg;
+    echo "<br><b>".htmlspecialchars( xl('This will not prevent you from going to the e-Prescriptions site.'), ENT_NOQUOTES)."</b>";
+    sleep(2);
+}
 //################################################
 //XML GENERATED BY OPENEMR
 //################################################
@@ -136,11 +159,21 @@ if($error==0)
     elseif($page=='medentry'){
         sqlQuery("update patient_data set soap_import_status=3 where pid=?",array($pid));
     }
+    foreach($allergy as $allId)
+    {
+        sqlQuery("update lists set erx_uploaded='1'  where type='allergy' and pid=? and id=?",array($pid,$allId));
+    }
     $prescArr=explode(':',$prescIds);
     foreach($prescArr as $prescid)
     {
-        sqlQuery("update prescriptions set erx_uploaded='1', active='0' where patient_id=? and id=?",array($pid,$prescid));
+        sqlQuery("update prescriptions set erx_uploaded='1' ,active='0' where patient_id=? and id=?",array($pid,$prescid));
     }
+    foreach($uploaded_med_arr as $value)
+    {
+        sqlQuery("update lists set erx_uploaded='1' where id=?",array($value));
+        //sqlQuery("update lists set enddate=".date('Y-m-d')." where 
+        //(enddate is null or enddate = '' ) and id=?  ",array($value));     
+    }	
 ?>
     <script language='JavaScript'>
     <?php require($GLOBALS['srcdir'] . "/restoreSession.php"); ?>
diff --git a/interface/eRx_xml.php b/interface/eRx_xml.php
index 084739222..ef908f858 100644
--- a/interface/eRx_xml.php
+++ b/interface/eRx_xml.php
@@ -364,12 +364,13 @@ function LicensedPrescriber($doc,$r)
         $doc->createTextNode( $user_details['federaldrugid'] )
     );
     $b->appendChild( $dea );
-    $msg = validation(xl('LicensedPrescriber UPIN'),$user_details['upin'],$msg);
+    if($user_details['upin']){
     $upin = $doc->createElement( "upin" );
     $upin->appendChild(
         $doc->createTextNode( $user_details['upin'] )
     );
     $b->appendChild( $upin );
+    }
     $licenseNumber = $doc->createElement( "licenseNumber" );
     $licenseNumber->appendChild(
         $doc->createTextNode( $user_details['state_license_number'] )
@@ -452,12 +453,13 @@ function SupervisingDoctor($doc,$r)
         $doc->createTextNode( $user_details['federaldrugid'] )
     );
     $b->appendChild( $dea );
-    $msg = validation(xl('Supervising Doctor UPIN'),$user_details['upin'],$msg);
+    if($user_details['upin']){
     $upin = $doc->createElement( "upin" );
     $upin->appendChild(
         $doc->createTextNode( $user_details['upin'] )
     );
     $b->appendChild( $upin );
+    }
     $licenseNumber = $doc->createElement( "licenseNumber" );
     $licenseNumber->appendChild(
         $doc->createTextNode( $user_details['state_license_number'] )
@@ -514,12 +516,13 @@ function MidlevelPrescriber($doc,$r)
         $doc->createTextNode( $user_details['federaldrugid'] )
     );
     $b->appendChild( $dea );
-    $msg = validation(xl('Midlevel Prescriber UPIN'),$user_details['upin'],$msg);
+    if($user_details['upin']){
     $upin = $doc->createElement( "upin" );
     $upin->appendChild(
         $doc->createTextNode( $user_details['upin'] )
     );
     $b->appendChild( $upin );
+    }
     $licenseNumber = $doc->createElement( "licenseNumber" );
     $licenseNumber->appendChild(
         $doc->createTextNode( $user_details['state_license_number'] )
@@ -530,14 +533,16 @@ function MidlevelPrescriber($doc,$r)
 
 function Patient($doc,$r,$pid)
 {
-    global $msg;
+    global $msg,$warning_msg,$dem_check;
     $patient_data=sqlQuery("select *, DATE_FORMAT(DOB,'%Y%m%d') AS date_of_birth from patient_data where pid=?",array($pid));
     $b = $doc->createElement( "Patient" );
     $b->setAttribute('ID',$patient_data['pid']);
     $PatientName = $doc->createElement( "PatientName" );
         $patient_data['lname']=stripSpecialCharacter($patient_data['lname']);    
         $patient_data['lname']=trimData($patient_data['lname'],35);
-        $msg = validation(xl('Patient Last name'),$patient_data['lname'],$msg);
+        //$msg = validation(xl('Patient Last name'),$patient_data['lname'],$msg);
+        if($patient_data['lname']=='')
+            $dem_check.=htmlspecialchars( xl("Patient Last name is missing"), ENT_NOQUOTES)."<br>";
         $last = $doc->createElement( "last" );
         $last->appendChild(
             $doc->createTextNode( $patient_data['lname'] )
@@ -545,7 +550,9 @@ function Patient($doc,$r,$pid)
         $PatientName->appendChild( $last );
         $patient_data['fname']=stripSpecialCharacter($patient_data['fname']);
         $patient_data['fname']=trimData($patient_data['fname'],35);
-        $msg = validation(xl('Patient First name'),$patient_data['fname'],$msg);
+        //$msg = validation(xl('Patient First name'),$patient_data['fname'],$msg);
+        if($patient_data['fname']=='')
+            $dem_check.=htmlspecialchars( xl("Patient First name is missing"), ENT_NOQUOTES)."<br>";
         $first = $doc->createElement( "first" );
         $first->appendChild(
             $doc->createTextNode( $patient_data['fname'] )
@@ -562,30 +569,39 @@ function Patient($doc,$r,$pid)
     $PatientAddress = $doc->createElement( "PatientAddress" );
         $patient_data['street']=stripSpecialCharacter($patient_data['street']);
         $patient_data['street']=trimData($patient_data['street'],35);
+        $msg = validation(xl('Patient Address'),$patient_data['street'],$msg);
+        if(trim($patient_data['street'])=='')
+            $warning_msg .= "<br>".htmlspecialchars( xl("Patient Address is missing"), ENT_NOQUOTES);
         $address1 = $doc->createElement( "address1" );
         $address1->appendChild(
             $doc->createTextNode( $patient_data['street'] )
         );
         $PatientAddress->appendChild( $address1 );
-        $msg = validation(xl('Patient City'),$patient_data['city'],$msg);
+        //$msg = validation(xl('Patient City'),$patient_data['city'],$msg);
+        if($patient_data['city']=='')
+            $dem_check.=htmlspecialchars( xl("Patient City is missing"), ENT_NOQUOTES)."<br>";
         $city = $doc->createElement( "city" );
         $city->appendChild(
             $doc->createTextNode( $patient_data['city'] )
         );
         $PatientAddress->appendChild( $city );
-        $msg = validation(xl('Patient State'),$patient_data['state'],$msg);
+        if($patient_data['state']){
         $state = $doc->createElement( "state" );
         $state->appendChild(
             $doc->createTextNode( $patient_data['state'] )
         );
         $PatientAddress->appendChild( $state );
-        $msg = validation(xl('Patient Zip'),$patient_data['postal_code'],$msg);
+        }
+        if($patient_data['postal_code']){
         $zip = $doc->createElement( "zip" );
         $zip->appendChild(
             $doc->createTextNode( $patient_data['postal_code'] )
         );
         $PatientAddress->appendChild( $zip );
-        $msg = validation(xl('Patient Country'),$patient_data['country_code'],$msg);
+        }
+        //$msg = validation(xl('Patient Country'),$patient_data['country_code'],$msg);
+        if(trim($patient_data['country_code'])=='')
+            $dem_check.=htmlspecialchars( xl("Patient Country is missing"), ENT_NOQUOTES)."<br>";
         $county_code = substr($patient_data['country_code'],0,2);
         $country = $doc->createElement( "country" );
         $country->appendChild(
@@ -595,31 +611,39 @@ function Patient($doc,$r,$pid)
     $b->appendChild( $PatientAddress );
     $PatientContact = $doc->createElement( "PatientContact" );
         $patient_data['phone_home']=stripPhoneSlashes($patient_data['phone_home']);
-        $msg = validation(xl('Patient Home phone'),$patient_data['phone_home'],$msg);
+        if($patient_data['phone_home']){
         $homeTelephone = $doc->createElement( "homeTelephone" );
         $homeTelephone->appendChild(
             $doc->createTextNode( $patient_data['phone_home'] )
         );
         $PatientContact->appendChild( $homeTelephone );
+        }
     $b->appendChild( $PatientContact );
     $PatientCharacteristics = $doc->createElement( "PatientCharacteristics" );
-        $msg = validation(xl('Patient DOB'),$patient_data['date_of_birth'],$msg);
+        if(trim($patient_data['date_of_birth'])=='' || $patient_data['date_of_birth']=='00000000')
+            $warning_msg .= "<br>".htmlspecialchars( xl("Patient Date Of Birth is missing"), ENT_NOQUOTES);
+        if($patient_data['date_of_birth'] && $patient_data['date_of_birth']!='00000000'){        
         $dob = $doc->createElement( "dob" );
         $dob->appendChild(
             $doc->createTextNode( $patient_data['date_of_birth'] )
         );
         $PatientCharacteristics->appendChild( $dob );
-        $msg = validation(xl('Patient Gender'),$patient_data['sex'],$msg);
+        }
+        if(trim($patient_data['sex'])=='')
+            $warning_msg .= "<br>".htmlspecialchars( xl("Patient Gender is missing"), ENT_NOQUOTES);
+        if($patient_data['sex']){
         $gender_val=substr($patient_data['sex'],0,1);
         $gender = $doc->createElement( "gender" );
         $gender->appendChild(
             $doc->createTextNode( $gender_val )
         );
         $PatientCharacteristics->appendChild( $gender );
+        }
     $b->appendChild( $PatientCharacteristics );
     PatientFreeformHealthplans($doc,$b,$pid);
-    PatientFreeformAllergy($doc,$b,$pid);    
+    $allergyId=PatientFreeformAllergy($doc,$b,$pid);    
     $r->appendChild( $b );
+	return $allergyId;
 }
 
 function OutsidePrescription($doc,$r,$pid,$prescid)
@@ -688,10 +712,13 @@ function PatientMedication($doc,$r,$pid,$med_limit)
     global $msg;
     $active='';
     if($GLOBALS['erx_upload_active']==1)
-        $active = " and enddate is null or enddate = ''";
-    $res_med=sqlStatement("select * from lists where type='medication' and pid=? and title<>'' and erx_uploaded='0' $active limit 0,$med_limit",array($pid));
+        $active = " and (enddate is null or enddate = '' or enddate = '0000-00-00' )";
+    $res_med=sqlStatement("select * from lists where type='medication' and pid=? and title<>'' 
+	and erx_uploaded='0' $active order by enddate limit 0,$med_limit",array($pid));
+	$uploaded_med_arr="";
     while($row_med=sqlFetchArray($res_med))
-    {
+    {	
+		$uploaded_med_arr[]=$row_med['id'];
         $b = $doc->createElement( "OutsidePrescription" );
             $externalId = $doc->createElement( "externalId" );
             $externalId->appendChild(
@@ -735,14 +762,17 @@ function PatientMedication($doc,$r,$pid,$med_limit)
             );
             $b->appendChild( $prescriptionType );
         $r->appendChild( $b );
-        sqlQuery("update lists set erx_uploaded='1',enddate=".date('Y-m-d')." where id=?",array($row_med['id']));
+        
     }
+	return $uploaded_med_arr;
 }
 
 function PatientFreeformAllergy($doc,$r,$pid)
 {
     $res=sqlStatement("SELECT id,l.title as title1,lo.title as title2,comments FROM lists AS l
-    LEFT JOIN list_options AS lo ON l.outcome=lo.option_id AND lo.list_id='outcome' WHERE `type`='allergy' AND pid=? AND erx_source='0' AND enddate IS NULL",array($pid));
+    LEFT JOIN list_options AS lo ON l.outcome=lo.option_id AND lo.list_id='outcome'
+	WHERE `type`='allergy' AND pid=? AND erx_source='0' and erx_uploaded='0' AND (enddate is null or enddate = '' or enddate = '0000-00-00')",array($pid));
+	$allergyId=array();
     while($row=sqlFetchArray($res))    
     {
         $val=array();
@@ -769,12 +799,14 @@ function PatientFreeformAllergy($doc,$r,$pid)
             if($val['comments']){
             $allergyComment = $doc->createElement( "allergyComment" );
                 $allergyComment->appendChild(
-                    $doc->createTextNode( $val['comments'] )
+                    $doc->createTextNode( stripSpecialCharacter($val['comments']) )
                 );
             $b->appendChild( $allergyComment );
             }
         $r->appendChild( $b );
+		$allergyId[]=$row['id'];
     }
+	return $allergyId;
 }
 
 function PatientFreeformHealthplans($doc,$r,$pid)
diff --git a/interface/patient_file/summary/add_edit_issue.php b/interface/patient_file/summary/add_edit_issue.php
index c340ad015..7895d8403 100644
--- a/interface/patient_file/summary/add_edit_issue.php
+++ b/interface/patient_file/summary/add_edit_issue.php
@@ -142,7 +142,8 @@ if ($_POST['form_save']) {
     "injury_type = '" . $form_injury_type           . "', " .
     "outcome = '"     . $_POST['form_outcome']      . "', " .
     "destination = '" . $_POST['form_destination']   . "', " .
-    "reaction ='"     . $_POST['form_reaction']     . "' " .
+    "reaction ='"     . $_POST['form_reaction']     . "', " .
+    "erx_uploaded = '0' " .
     "WHERE id = '$issue'";
     sqlStatement($query);
     if ($text_type == "medication" && enddate != '') {
diff --git a/interface/patient_file/summary/stats.php b/interface/patient_file/summary/stats.php
index 374b70728..549995e1b 100644
--- a/interface/patient_file/summary/stats.php
+++ b/interface/patient_file/summary/stats.php
@@ -51,7 +51,11 @@ foreach ($ISSUE_TYPES as $key => $arr) {
     // $result = getListByType($pid, $key, "id,title,begdate,enddate,returndate,extrainfo", "all", "all", 0);
 
     $query = "SELECT * FROM lists WHERE pid = ? AND type = ? AND ";
-    $query .= "enddate IS NULL ";
+    $query .= "(enddate is null or enddate = '' or enddate = '0000-00-00') ";
+    if($GLOBALS['erx_enable'] && $GLOBALS['erx_medication_display'] && $key=='medication')
+		$query .= "and erx_uploaded != '1' ";
+	if($GLOBALS['erx_enable'] && $GLOBALS['erx_allergy_display'] && $key=='allergy')
+		$query .= "and erx_uploaded != '1' ";
     $query .= "ORDER BY begdate";
     $pres = sqlStatement($query, array($pid, $key) );
 
@@ -290,13 +294,14 @@ if(sqlNumRows($res)==0)
 }
 while($row_currentMed=sqlFetchArray($res))
 {
+    $runit=generate_display_field(array('data_type'=>'1','list_id'=>'drug_units'),$row_currentMed['unit']);
     $rin=generate_display_field(array('data_type'=>'1','list_id'=>'drug_form'),$row_currentMed['form']);
     $rroute=generate_display_field(array('data_type'=>'1','list_id'=>'drug_route'),$row_currentMed['route']);
     $rint=generate_display_field(array('data_type'=>'1','list_id'=>'drug_interval'),$row_currentMed['interval']);
     ?>
     <tr class=text style='font-weight:bold;color:blue;'>
 	    <td><?php echo $row_currentMed['drug'];?></td>
-	    <td><?php echo htmlspecialchars($row_currentMed['dosage']." ".xl("in")." ".$rin['title']." ".$rint['title'],ENT_NOQUOTES);?></td>
+	    <td><?php $unit=''; if($row_currentMed['size']>0) $unit=$row_currentMed['size']." ".$runit." "; echo htmlspecialchars($unit." ".$row_currentMed['dosage']." ".$rin." ".$rroute." ".$rint,ENT_NOQUOTES);?></td>
     </tr>
 <?php
 }
diff --git a/interface/patient_file/summary/stats_full.php b/interface/patient_file/summary/stats_full.php
index 67492411d..968592a75 100644
--- a/interface/patient_file/summary/stats_full.php
+++ b/interface/patient_file/summary/stats_full.php
@@ -147,7 +147,10 @@ foreach ($ISSUE_TYPES as $focustype => $focustitles) {
   <?php
 
   // collect issues
-  $pres = sqlStatement("SELECT * FROM lists WHERE pid = ? AND type = ? " .
+  $condition = '';
+  if($GLOBALS['erx_enable'] && $GLOBALS['erx_medication_display'] && $focustype=='medication')
+   $condition .= "and erx_uploaded != '1' ";
+  $pres = sqlStatement("SELECT * FROM lists WHERE pid = ? AND type = ? $condition" .
    "ORDER BY begdate", array($pid,$focustype) );
 
   // if no issues (will place a 'None' text vs. toggle algorithm here)
@@ -197,13 +200,15 @@ foreach ($ISSUE_TYPES as $focustype => $focustitles) {
     else {
       $statusCompute = htmlspecialchars( xl("Inactive") ,ENT_NOQUOTES);
     }
-
+    $click_class='';
+    if($row['erx_source']==0)
+    $click_class='statrow';
     // output the TD row of info
     if ($row['enddate'] == NULL) {
-      echo " <tr class='$bgclass detail statrow' style='color:red;font-weight:bold' id='$rowid'>\n";
+      echo " <tr class='$bgclass detail $click_class' style='color:red;font-weight:bold' id='$rowid'>\n";
     }
     else {
-      echo " <tr class='$bgclass detail statrow' id='$rowid'>\n";
+      echo " <tr class='$bgclass detail $click_class' id='$rowid'>\n";
     }
     echo "  <td style='text-align:left'>" . htmlspecialchars($disptitle,ENT_NOQUOTES) . "</td>\n";
     echo "  <td>" . htmlspecialchars($row['begdate'],ENT_NOQUOTES) . "&nbsp;</td>\n";
diff --git a/interface/soap_functions/soap_allergy.php b/interface/soap_functions/soap_allergy.php
index d884621a8..1b2fd7e29 100644
--- a/interface/soap_functions/soap_allergy.php
+++ b/interface/soap_functions/soap_allergy.php
@@ -75,7 +75,7 @@ foreach($array as $key => $value){
 }
 $allergyArray=$array['NewDataSet']['Table'];
 
-sqlQuery("update lists set enddate=NOW() where type='allergy' and pid=?",array($patientid));
+
 $j=0;
 for($i=0;$i<sizeof($allergyArray);$i++)
 {
@@ -87,15 +87,15 @@ for($i=0;$i<sizeof($allergyArray);$i++)
         sqlQuery("INSERT INTO list_options (list_id,option_id,title,seq) VALUES ('outcome',?,?,?)",array(($routcome['option_id']+1),$allergyArray[$i]['AllergySeverityName'],($routcome['option_id']+1)));
         $routcome['option_id']=$routcome['option_id']+1;
     }
-    $res=sqlStatement("select * from lists where pid=? and type='allergy' and title=?",array($patientid,$allergyArray[$i]['AllergyName']));
+    $res=sqlStatement("select * from lists where pid=? and type='allergy' and title=? and (enddate is null or enddate = '' or enddate = '0000-00-00')",array($patientid,$allergyArray[$i]['AllergyName']));
     $row=sqlFetchArray($res);
     if(sqlNumRows($res)==0)
     {
-        sqlQuery("insert into lists (date,type,title,pid,user,outcome,external_allergyid,erx_source) values (NOW(),'allergy',?,?,?,?,?,'1')",
+        sqlQuery("insert into lists (date,type,title,pid,user,outcome,external_allergyid,erx_source,begdate) values (NOW(),'allergy',?,?,?,?,?,'1',now())",
         array($allergyArray[$i]['AllergyName'], $patientid, $_SESSION['authUserID'], $routcome['option_id'], $allergyArray[$i]['AllergyId']));
         setListTouch ($patientid,'allergy');
         $j++;
-    }
+    }	
     elseif($row['erx_source']==0)
     {
         sqlQuery("update lists set outcome=?, erx_source='1', external_allergyid=? where pid=? and title=?",
@@ -106,8 +106,49 @@ for($i=0;$i<sizeof($allergyArray);$i++)
         sqlQuery("update lists set outcome=? where pid=? and erx_source='1' and external_allergyid=? and title=?",
         array($routcome['option_id'], $patientid, $allergyArray[$i]['AllergyId'], $allergyArray[$i]['AllergyName']));
     }
-    sqlQuery("update lists set enddate = null where type='allergy' and pid=? and title=?",array($patientid,$allergyArray[$i]['AllergyName']));
+    //sqlQuery("update lists set enddate = null where type='allergy' and pid=? and title=?",array($patientid,$allergyArray[$i]['AllergyName']));
+}
+$res=sqlStatement("select id,title from lists where pid=? and type='allergy' and erx_source='1' and (enddate is null or enddate = '' or enddate = '0000-00-00')",array($patientid));
+while($row=sqlFetchArray($res))
+{
+	$flag=0;
+	for($i=0;$i<sizeof($allergyArray);$i++){
+		if($allergyArray[$i]['AllergyName']==$row['title'])
+		{
+			$flag=1;
+			break;
+		}		
+	}
+	if($flag==0)
+		sqlQuery("update lists set enddate=now() where pid=? and id=? and type='allergy'",array($patientid,$row['id']));
+}
+
+$xml1_0=array();
+$xml1_0['credentials']['PartnerName']=$cred['0'];
+$xml1_0['credentials']['Name']=$cred['1'];
+$xml1_0['credentials']['Password']=$cred['2'];
+
+$xml1_0['accountRequest']['AccountId']='1';
+$xml1_0['accountRequest']['SiteId']=$erxSiteID['federal_ein'];
+
+$xml1_0['patientRequest']['PatientId']=$patientid;
+
+$xml1_0['patientInformationRequester']['UserType']='D';
+$xml1_0['patientInformationRequester']['UserId']=$user_details['id'];
+
+$xml = $client->GetPatientFreeFormAllergyHistory($xml1_0);
+$xml_response=$xml->GetPatientFreeFormAllergyHistoryResult->patientFreeFormAllergyExtendedDetail->PatientFreeFormAllergyExtendedDetail;
+$xml_response_count=$xml->GetPatientFreeFormAllergyHistoryResult->result->RowCount;
+if($xml_response_count>1){
+    for($i=0;$i<sizeof($xml_response);$i++)
+    {
+        sqlQuery("update lists set erx_uploaded='0' where id=?",array($xml_response[$i]->ExternalId));
+    }
 }
+elseif($xml_response_count==1){
+    sqlQuery("update lists set erx_uploaded='0' where id=?",array($xml_response->ExternalId));
+}
+
 if($j!=0)
 sqlQuery("update patient_data set soap_import_status=? where pid=?",array('4',$patientid));
 if($xml_response_count==0)
diff --git a/interface/soap_functions/soap_patientfullmedication.php b/interface/soap_functions/soap_patientfullmedication.php
index 67bb05a7e..4c62b2799 100644
--- a/interface/soap_functions/soap_patientfullmedication.php
+++ b/interface/soap_functions/soap_patientfullmedication.php
@@ -36,6 +36,12 @@ require_once('../eRx_xml.php');
 require_once('../../library/xmltoarray_parser_htmlfix.php');
 require_once($GLOBALS['fileroot'] . "/library/amc.php");
 set_time_limit(0);
+
+function number($str)
+{
+    return preg_replace('/[^0-9.]/','',$str);
+}
+
 if(!$patientid)
 $patientid=$pid;
 if($_REQUEST['patient'])
@@ -92,7 +98,7 @@ for($i=0;$i<sizeof($medArray);$i++)
     if($medArray[$i]['DosageForm']){
     $qin=sqlStatement("SELECT option_id FROM list_options WHERE list_id='drug_form' AND title = ?",array($medArray[$i]['DosageForm']));
     $rin=sqlFetchArray($qin);
-    if(!$rin['option_id'])
+    if(sqlNumRows($qin)<=0)
     {
         $rin=sqlQuery("SELECT option_id AS option_id FROM list_options WHERE list_id='drug_form' ORDER BY ABS(option_id) DESC LIMIT 1");
         sqlQuery("INSERT INTO list_options (list_id,option_id,title,seq) VALUES ('drug_form',?,?,?)",array(($rin['option_id']+1),$medArray[$i]['DosageForm'],($rin['option_id']+1)));
@@ -103,7 +109,7 @@ for($i=0;$i<sizeof($medArray);$i++)
     if($medArray[$i]['Route']){
     $qroute=sqlStatement("SELECT option_id FROM list_options WHERE list_id='drug_route' AND title = ?",array($medArray[$i]['Route']));
     $rroute=sqlFetchArray($qroute);
-    if(!$rroute['option_id'])
+    if(sqlNumRows($qroute)<=0)
     {
         $rroute=sqlQuery("SELECT option_id AS option_id FROM list_options WHERE list_id='drug_route' ORDER BY ABS(option_id) DESC LIMIT 1");
         sqlQuery("INSERT INTO list_options (list_id,option_id,title,seq) VALUES ('drug_route',?,?,?)",array(($rroute['option_id']+1),$medArray[$i]['Route'],($rroute['option_id']+1)));
@@ -114,7 +120,7 @@ for($i=0;$i<sizeof($medArray);$i++)
     if($medArray[$i]['StrengthUOM']){
     $qunit=sqlStatement("SELECT option_id FROM list_options WHERE list_id='drug_units' AND title = ?",array($medArray[$i]['StrengthUOM']));
     $runit=sqlFetchArray($qunit);
-    if(!$runit['option_id'])
+    if(sqlNumRows($qunit)<=0)
     {
         $runit=sqlQuery("SELECT option_id AS option_id FROM list_options WHERE list_id='drug_units' ORDER BY ABS(option_id) DESC LIMIT 1");
         sqlQuery("INSERT INTO list_options (list_id,option_id,title,seq) VALUES ('drug_units',?,?,?)",array(($runit['option_id']+1),$medArray[$i]['StrengthUOM'],($runit['option_id']+1)));
@@ -125,7 +131,7 @@ for($i=0;$i<sizeof($medArray);$i++)
     if($medArray[$i]['DosageFrequencyDescription']){
     $qint=sqlStatement("SELECT option_id FROM list_options WHERE list_id='drug_interval' AND title = ?",array($medArray[$i]['DosageFrequencyDescription']));
     $rint=sqlFetchArray($qint);
-    if(!$rint['option_id'])
+    if(sqlNumRows($qint)<=0)
     {
         $rint=sqlQuery("SELECT option_id AS option_id FROM list_options WHERE list_id='drug_interval' ORDER BY ABS(option_id) DESC LIMIT 1");
         sqlQuery("INSERT INTO list_options (list_id,option_id,title,seq) VALUES ('drug_interval',?,?,?)",array(($rint['option_id']+1),$medArray[$i]['DosageFrequencyDescription'],($rint['option_id']+1)));
@@ -145,7 +151,7 @@ for($i=0;$i<sizeof($medArray);$i++)
         values
         (?,?,?,?,?,?,?,?,?,?,?,?,?,?,NOW(),?,?,?,'1',?)",
         array($medArray[$i]['ExternalPatientID'], $provider['id'],$encounter, substr($medArray[$i]['PrescriptionDate'],0,10), $medArray[$i]['DrugName'],
-        $medArray[$i]['DrugID'], $rin['option_id'], $medArray[$i]['DosageNumberDescription'], $medArray[$i]['Strength'], $runit['option_id'],
+        $medArray[$i]['DrugID'], $rin['option_id'], $medArray[$i]['DosageNumberDescription'], number($medArray[$i]['Strength']), $runit['option_id'],
         $rroute['option_id'], $rint['option_id'], $medArray[$i]['Refills'], $medArray[$i]['PrescriptionNotes'], 
         $_SESSION['authUserID'], $medArray[$i]['SiteID'], $medArray[$i]['PrescriptionGuid'], $medArray[$i]['rxcui']));
         $j++;
@@ -157,7 +163,7 @@ for($i=0;$i<sizeof($medArray);$i++)
         `DATETIME`=NOW(),`USER`=?, site=? ,erx_source='1', rxnorm_drugcode=?, active='1'
         WHERE prescriptionguid=? AND patient_id=?
         ",array($provider['id'],$medArray[$i]['DrugName'],$medArray[$i]['DrugID'],$rin['option_id'],$medArray[$i]['DosageNumberDescription'],
-        $medArray[$i]['Strength'],$runit['option_id'],$rroute['option_id'],$rint['option_id'],$medArray[$i]['Refills'],
+        number($medArray[$i]['Strength']),$runit['option_id'],$rroute['option_id'],$rint['option_id'],$medArray[$i]['Refills'],
         $medArray[$i]['PrescriptionNotes'],$_SESSION['authUserID'],
         $medArray[$i]['SiteID'],$medArray[$i]['rxcui'],$medArray[$i]['PrescriptionGuid'],$medArray[$i]['ExternalPatientID']));
     }
diff --git a/templates/prescription/general_list.html b/templates/prescription/general_list.html
index 77109ab7b..a23823f75 100644
--- a/templates/prescription/general_list.html
+++ b/templates/prescription/general_list.html
@@ -164,9 +164,9 @@ function Checking(chk) {
     <td class="editscript"  id="{$prescription->id}">
         <a class='editscript css_button_small' id='{$prescription->id}' href="controller.php?prescription&edit&id={$prescription->id}" style="margin-top:-2px"><span>{xl t='Edit'}</span></a>
         {if $prescription->active > 0}<b>{/if}{$prescription->drug}{if $prescription->active > 0}</b>{/if}&nbsp;
-    </td>
+    </td>	
 	{else}
-    <td class="editscript"  id="{$prescription->id}">
+    <td id="{$prescription->id}">
 	{if $prescription->active > 0}<b>{/if}{$prescription->drug}{if $prescription->active > 0}</b>{/if}&nbsp;
     </td>
 	{/if}
@@ -177,9 +177,15 @@ function Checking(chk) {
     <td id="{$prescription->id}">
       {$prescription->get_dosage_display()} &nbsp;
     </td>
+	{if $prescription->erx_source==0}
     <td class="editscript" id="{$prescription->id}">
       {$prescription->quantity} &nbsp;
     </td>
+	{else}
+	<td id="{$prescription->id}">
+      {$prescription->quantity} &nbsp;
+    </td>
+	{/if}
     <td id="{$prescription->id}">
        {$prescription->get_size()} {$prescription->get_unit_display()}&nbsp;
     </td>
-- 
2.11.4.GIT