Fixes

Signed-off-by: Yash Bothra <yashrajbothra786@gmail.com>
openemr · bradymiller · Jul 24, 2020 · Jul 12, 2020 · Jul 12, 2020 · Jul 12, 2020
commit 2604157fe6ab5f089b83d55849c594765278a53d
diff --git a/API_README.md b/API_README.md
@@ -838,7 +838,7 @@ Request:
 curl -X GET 'http://localhost:8300/apis/api/allergy'
 ```
 
-#### GET /api/allergy/:uuid
+#### GET /api/allergy/:auuid
 
 Request:
 
@@ -888,7 +888,7 @@ curl -X PUT 'http://localhost:8300/apis/api/patient/90c196f2-51cc-4655-8858-3a80
 }'
 ```
 
-#### DELETE /api/patient/:pid/allergy/:auuid
+#### DELETE /api/patient/:puuid/allergy/:auuid
 
 Request:
 

diff --git a/_rest_routes.inc.php b/_rest_routes.inc.php
@@ -179,31 +179,31 @@
         RestConfig::authorization_check("patients", "med");
         return (new AllergyIntoleranceRestController())->getAll();
     },
-    "GET /api/allergy/:uuid" => function ($uuid) {
+    "GET /api/allergy/:auuid" => function ($auuid) {
         RestConfig::authorization_check("patients", "med");
-        return (new AllergyIntoleranceRestController())->getOne($uuid);
+        return (new AllergyIntoleranceRestController())->getOne($auuid);
     },
     "GET /api/patient/:puuid/allergy" => function ($puuid) {
         RestConfig::authorization_check("patients", "med");
         return (new AllergyIntoleranceRestController())->getAll(['lists.pid' => $puuid]);
     },
-    "GET /api/patient/:puuid/allergy/:uuid" => function ($puuid, $uuid) {
+    "GET /api/patient/:puuid/allergy/:auuid" => function ($puuid, $auuid) {
         RestConfig::authorization_check("patients", "med");
-        return (new AllergyIntoleranceRestController())->getAll(['lists.pid' => $puuid, 'lists.id' => $uuid]);
+        return (new AllergyIntoleranceRestController())->getAll(['lists.pid' => $puuid, 'lists.id' => $auuid]);
     },
     "POST /api/patient/:puuid/allergy" => function ($puuid) {
         RestConfig::authorization_check("patients", "med");
         $data = (array) (json_decode(file_get_contents("php://input")));
         return (new AllergyIntoleranceRestController())->post($puuid, $data);
     },
-    "PUT /api/patient/:puuid/allergy/:uuid" => function ($puuid, $uuid) {
+    "PUT /api/patient/:puuid/allergy/:auuid" => function ($puuid, $auuid) {
         RestConfig::authorization_check("patients", "med");
         $data = (array) (json_decode(file_get_contents("php://input")));
-        return (new AllergyIntoleranceRestController())->put($puuid, $uuid, $data);
+        return (new AllergyIntoleranceRestController())->put($puuid, $auuid, $data);
     },
-    "DELETE /api/patient/:puuid/allergy/:uuid" => function ($pid, $aid) {
+    "DELETE /api/patient/:puuid/allergy/:auuid" => function ($puuid, $auuid) {
         RestConfig::authorization_check("patients", "med");
-        return (new AllergyIntoleranceRestController())->delete($pid, $aid);
+        return (new AllergyIntoleranceRestController())->delete($puuid, $auuid);
     },
     "GET /api/patient/:pid/medication" => function ($pid) {
         RestConfig::authorization_check("patients", "med");

diff --git a/interface/patient_file/summary/add_edit_issue.php b/interface/patient_file/summary/add_edit_issue.php
@@ -780,14 +780,16 @@ function divclick(cb, divid) {
                             ?>
                         </div>
                         <!-- End of reaction -->
+                        <?php if($thistype == "allergy") { ?>
                         <!-- Verification Status for Medication Allergy -->
                         <div class="form-group col-12" id='row_verification'>
                             <label class="col-form-label" for="form_verification"><?php echo xlt('Verification Status'); ?>:</label>
                             <?php
                             echo generate_select_list('form_verification', 'allergyintolerance-verification', $irow['verification'], '', '', '', '');
                             ?>
                         </div>
-                        <!-- End of Verification Statu -->
+                        <!-- End of Verification Status -->
+                        <?php } ?>
                         <div class="form-group col-12" id='row_referredby'>
                             <label class="col-form-label" for="form_referredby"><?php echo xlt('Referred by'); ?>:</label>
                             <input type='text' name='form_referredby' id='form_referredby' class='form-control' value='<?php echo attr($irow['referredby']) ?>' title='<?php echo xla('Referring physician and practice'); ?>' />

diff --git a/sql/database.sql b/sql/database.sql
@@ -6282,7 +6282,7 @@ INSERT INTO list_options(list_id,option_id,title,seq) VALUES ("us-core-provider-
 INSERT INTO list_options(list_id,option_id,title,seq) VALUES ("us-core-provider-specialty", "390200000X", "Student in an Organized Health Care Education/Training Program", 8470);
 INSERT INTO list_options(list_id,option_id,title,seq) VALUES ("us-core-provider-specialty", "405300000X", "Prevention Professional", 8480);
 
--- allergyintolerance-verification [FHIR AllergyIntolerance.verification]
+-- AllergyIntolerance Verification Status Codes [FHIR AllergyIntolerance.verification]
 INSERT INTO `list_options` ( `list_id`, `option_id`, `title`, `seq` ) VALUES ('lists' ,'allergyintolerance-verification', 'AllergyIntolerance Verification Status Codes', 1);
 INSERT INTO list_options(list_id,option_id,title,seq) VALUES ('allergyintolerance-verification', 'unconfirmed', 'Unconfirmed', 10);
 INSERT INTO list_options(list_id,option_id,title,seq) VALUES ('allergyintolerance-verification', 'confirmed', 'Confirmed', 20);

diff --git a/src/Services/AllergyIntoleranceService.php b/src/Services/AllergyIntoleranceService.php
@@ -16,7 +16,7 @@
 use OpenEMR\Validators\AllergyIntoleranceValidator;
 use OpenEMR\Validators\ProcessingResult;
 
-require_once($GLOBALS['fileroot'] . '/custom/code_types.inc.php');
+require_once(__DIR__  . '/../../custom/code_types.inc.php');
 
 class AllergyIntoleranceService extends BaseService
 {
@@ -53,14 +53,14 @@ public function getAll($search = array(), $isAndCondition = true)
     {
         // Validating and Converting Patient UUID to PID
         if (isset($search['lists.pid'])) {
-            $isValidAllergy = $this->allergyIntoleranceValidator->validateId(
+            $isValidPatient = $this->allergyIntoleranceValidator->validateId(
                 'uuid',
                 self::PATIENT_TABLE,
                 $search['lists.pid'],
                 true
             );
-            if ($isValidAllergy !== true) {
-                return $isValidAllergy;
+            if ($isValidPatient !== true) {
+                return $isValidPatient;
             }
             $puuidBytes = UuidRegistry::uuidToBytes($search['lists.pid']);
             $search['lists.pid'] = $this->getIdByUuid($puuidBytes, self::PATIENT_TABLE, "pid");