Changeset 1679 for cprs/trunk/CPRS-Chart/rReports.pas

Timestamp:

May 7, 2015, 12:34:29 PM (9 years ago)

Author:

healthsevak

Message:

Updating the working copy to CPRS version 28

File:

• cprs/trunk/CPRS-Chart/rReports.pas (modified) (6 diffs)

cprs/trunk/CPRS-Chart/rReports.pas

@@ -46 +46 @@
            aComponents: TStringlist; ARemoteSiteID, ARemoteQuery, AHSTag: string): TStrings;
 procedure PrintWindowsReport(ARichEdit: TRichEdit; APageBreak, ATitle: string;
-  var ErrMsg: string);
+  var ErrMsg: string; IncludeHeader: Boolean = false);
 function DefaultToWindowsPrinter: Boolean;
 procedure PrintGraph(GraphImage: TChart; PageTitle: string);
@@ -61 +61 @@
 implementation
 
-uses uCore, rCore, Printers, clipbrd, uReports, fReports
-{ TODO -oRV -cWVEHR Long Age : Changed to use long age }
-, rWVEHR;
+uses uCore, rCore, Printers, clipbrd, uReports, fReports;
 
 var
@@ -545 +543 @@
 end;
 
-procedure PrintWindowsReport(ARichEdit: TRichEdit; APageBreak, Atitle: string; var ErrMsg: string);
+procedure PrintWindowsReport(ARichEdit: TRichEdit; APageBreak, Atitle: string; var ErrMsg: string; IncludeHeader: Boolean = false);
 var
   i, j, x, y, LineHeight: integer;
@@ -588 +586 @@
               y := LineHeight * 5;            // 5 lines = .83" top margin   v15.9 (RV)
               Printer.BeginDoc;
+
+              //Do we need to add the header?
+              IF IncludeHeader then begin
+               for j := 0 to aHeader.Count - 1 do
+                begin
+                 Printer.Canvas.TextOut(x, y, aHeader[j]);
+                 y := y + LineHeight;
+                end;
+              end;
+
               for i := 0 to Lines.Count - 1 do
                 begin
@@ -594 +602 @@
                       Printer.NewPage;
                       y := LineHeight * 5;   // 5 lines = .83" top margin    v15.9 (RV)
-                      if aGoHead = '1' then
+                      if (IncludeHeader) then
                         begin
                           for j := 0 to aHeader.Count - 1 do
@@ -639 +647 @@
       tmpStr := Patient.Name + '   ' + Patient.SSN;
       tmpItem := tmpStr + StringOfChar(' ', 39 - Length(tmpStr)) + Encounter.LocationName;
-{ TODO -oRV -cWVEHR Long Age : Changed to use long age }
-      //tmpStr := FormatFMDateTime('mmm dd, yyyy', Patient.DOB) + ' (' + IntToStr(Patient.Age) + ')';
-      tmpStr := FormatFMDateTime('mmm dd, yyyy', Patient.DOB) + ' (' + GetPatientBriefAge(Patient.DFN) + ')';
-{}
+      tmpStr := FormatFMDateTime('mmm dd, yyyy', Patient.DOB) + ' (' + IntToStr(Patient.Age) + ')';
       tmpItem := tmpItem + StringOfChar(' ', 74 - (Length(tmpItem) + Length(tmpStr))) + tmpStr;
       Add(tmpItem);