Merge pull request #152 from PIH/MEX-662

MEX-662: add provider name to the printed RX

Author: cioan

configuration/pih/htmlforms/consult.xml

@@ -332,6 +332,8 @@
                   jq("#patientAllergies").val(allergies);
               }
             });
+
+
         });
     </script>
 
@@ -466,10 +468,22 @@
 
     <section id="encounter-location" sectionTag="fieldset" headerTag="legend" headerStyle="title">
         <div class="section-container">
-            <label>
-                <uimessage code="pihcore.locationRequired"/>
-            </label>
-            <encounterLocation default="SessionAttribute:emrContext.sessionLocationId"/>
+            <div class="two-columns">
+                <div>
+                    <label>
+                        <uimessage code="pihcore.locationRequired"/>
+                    </label>
+                    <encounterLocation default="SessionAttribute:emrContext.sessionLocationId"/>
+                </div>
+                <div>
+                    <label>
+                        <uimessage code="emr.patientDashBoard.provider" />:
+                    </label>
+                    <span id="encounterProvider">
+                        <lookup complexExpression="#if($encounter) #foreach ($encProv in $encounter.activeEncounterProviders) $ui.format($encProv.provider.person) #end #else $ui.format($user.person) #end" />
+                    </span>
+                </div>
+            </div>
         </div>
     </section>
 
@@ -2401,6 +2415,7 @@
                     }
                     const consultDate = moment(consultDateYmd);
                     const formattedConsultDate = consultDate.locale('es').format('DD MMM YYYY');
+                    const provider = $('#encounterProvider').text().trim();
 
                     // Patient Name
                     const givenName = jq(".zl-givenName").html().trim();
@@ -2467,7 +2482,7 @@
                                         </ifMode>
                                         <ifMode mode="VIEW" include="true">
                                             const substringToRemove = '[X] ';
-                                            jq(this).find('.inline-timing').children('span.value:first-child').each(function() {
+                                            jq(this).find('.inline-timing input:checkbox:checked').each(function() {
                                                 const label = jq(this).text().replace(substringToRemove, '');
                                                 const timingDose = jq(this).next(".value").text();
                                                 timingDoses.push( {
@@ -2499,7 +2514,7 @@
                         });
                     });
 
-                    printPrescription(formattedConsultDate, patientName, age, diagnoses, prescriptions, patientAllergies);
+                    printPrescription(formattedConsultDate, patientName, age, diagnoses, prescriptions, patientAllergies, provider);
                 });
             });
         </script>

configuration/pih/scripts/global/ces.js

@@ -281,7 +281,7 @@ function setUpPlanSection(
  * One is a library that manipulates PDFs.  See: https://pdf-lib.js.org/
  * The other is a library that supports printing PDFs directly using the generated PDF output.  See:  https://printjs.crabbly.com/
  */
-async function printPrescription(formattedConsultDate, patientName, age, diagnoses, prescriptions, allergies) {
+async function printPrescription(formattedConsultDate, patientName, age, diagnoses, prescriptions, allergies, provider) {
 
   // Load in the PDF template
   const templateUrl = emr.resourceLink('file', 'configuration/pih/images/recetas-template.pdf');
@@ -320,6 +320,13 @@ async function printPrescription(formattedConsultDate, patientName, age, diagnos
   //   color: PDFLib.rgb(1.0,0.59608, 0.0),
   // })
 
+  page.drawText(provider ? provider : '', {
+    x: 285,
+    y: 95,
+    size: pageFontSize,
+    font: pageFont
+  });
+
   prescriptions.forEach( p => {
     let drugNameLines = splitToLines(p.drugName ?? '', 35);
     let instructionLines = splitToLines(p.instructions ?? '', 35);
@@ -337,6 +344,12 @@ async function printPrescription(formattedConsultDate, patientName, age, diagnos
       // reset the row position
       rowPosition = 420;
       doseRowPosition = rowPosition;
+      page.drawText( provider ? provider : '', {
+        x: 285,
+        y: 95,
+        size: pageFontSize,
+        font: pageFont
+      });
     }
 
     for ( var i = 0; i < maxlines; i++ ) {