Ignore:
Timestamp:
Jul 6, 2008, 8:20:14 PM (16 years ago)
Author:
Kevin Toppenberg
Message:

Uploading from OR_30_258

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cprs/branches/foia-cprs/CPRS-Chart/fReminderDialog.pas

    r459 r460  
    1111  TfrmRemDlg = class(TForm)
    1212    sb1: TScrollBox;
     13    sb2: TScrollBox;
     14    splTxtData: TSplitter;
     15    Label1: TLabel;
     16    pnlFrmBottom: TPanel;
    1317    pnlBottom: TPanel;
     18    splText: TSplitter;
    1419    reData: TRichEdit;
    1520    reText: TRichEdit;
     
    2025    btnNext: TButton;
    2126    btnFinish: TButton;
    22     sb2: TScrollBox;
    23     splTxtData: TSplitter;
    24     splText: TSplitter;
    2527    btnClinMaint: TButton;
     28    btnVisit: TButton;
    2629    lblFootnotes: TStaticText;
    27     btnVisit: TButton;
    28     Label1: TLabel;
    2930    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    3031    procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
     
    368369  reData.Color := ReadOnlyColor;
    369370  reText.Color := ReadOnlyColor;
    370  (* FSCCond := EligbleConditions;
    371   FSCRelated  := SCC_NA;              AGP Change 25.2
     371  FSCCond := EligbleConditions;
     372 (* FSCRelated  := SCC_NA;
    372373  FAORelated  := SCC_NA;
    373   FIRRelated  := SCC_NA;
     374  FIRRelated  := SCC_NA;       AGP Change 25.2
    374375  FECRelated  := SCC_NA;
    375376  FMSTRelated := SCC_NA;
     
    377378  FCVRelated  := SCC_NA;
    378379  with FSCCond do
    379     FSCPrompt := (SCAllow or AOAllow or IRAllow or ECAllow or MSTAllow or HNCAllow or CVAllow);  *)
     380    FSCPrompt := (SCAllow or AOAllow or IRAllow or ECAllow or MSTAllow or HNCAllow or CVAllow); *)
    380381  NotifyWhenRemindersChange(RemindersChanged);
    381382  RemForm.Drawers.NotifyWhenRemTreeChanges(RemindersChanged);
     
    504505  begin
    505506    Box := GetBox(TRUE);
    506     if Box.ControlCount > 0 then ClearControls; //AGP Change 25.7 this change should
     507    if Box.ControlCount > 0 then ClearControls; //AGP Change 26.1 this change should
    507508                                                //resolve the problem with Duplicate CheckBoxes
    508509                                                //appearing on some reminder dialogs CQ #2843
     
    754755  msg, RemWipe: string;
    755756
    756 begin
    757  //AGP 25.11 Move RemWipe section to cancel button to
     757
     758begin
     759 //AGP 25.11 Added RemWipe section to cancel button to
    758760 //flag the patient specific dialog to be destroy if not in process.
    759761 RemWipe := '';
     
    761763    begin
    762764      Result := TRUE;
    763       if Piece(FReminder.DlgData,U,3)='1' then RemWipe := Piece(FReminder.DlgData,U,1);
     765      if FReminder.RemWipe = 1 then RemWipe := Piece(FReminder.DlgData,U,1);
    764766    end
    765767  else
     
    769771    for i := 0 to RemindersInProcess.Count-1 do
    770772    begin
    771       if Piece(TReminder(RemindersInProcess.Objects[i]).RemData,U,11)='1' then
     773      //if Piece(TReminder(RemindersInProcess.Objects[i]).RemData,U,11)='1' then
     774      if TReminderDialog(TReminder(RemindersInProcess.Objects[i])).RemWipe = 1 then
    772775          begin
    773776             if RemWipe ='' then RemWipe := TReminder(RemindersInProcess.Objects[i]).IEN
     
    10401043              begin
    10411044                 Rem := FReminder;
    1042                  if Piece(Rem.DlgData,U,3)='1' then
     1045                 if Rem.RemWipe = 1 then
    10431046                     RemWipe := Piece(Rem.DlgData,U,1);
    10441047              end
     
    10461049              begin
    10471050                Rem := TReminder(RemindersInProcess.Objects[i]);
    1048                 if Piece(TReminder(RemindersInProcess.Objects[i]).RemData,U,11)='1' then
     1051                if TReminderDialog(TReminder(RemindersInProcess.Objects[i])).RemWipe = 1 then
    10491052                   begin
    10501053                     if RemWipe ='' then RemWipe := TReminder(RemindersInProcess.Objects[i]).IEN
     
    11581161        begin
    11591162          PCEObj := RemForm.PCEObj;
    1160       (* AGP Change 25.2 Remove this section base on the Clinical Workgroup decision
    1161          if FSCPrompt and (ndSC in PCEObj.NeededPCEData) then
     1163        (* AGP CHANGE 23.2 Remove this section base on the Clinical Workgroup decision
     1164          if FSCPrompt and (ndSC in PCEObj.NeededPCEData) then
    11621165            btnVisitClick(nil);
    11631166          PCEObj.SCRelated  := FSCRelated;
     
    11671170          PCEObj.MSTRelated := FMSTRelated;
    11681171          PCEObj.HNCRelated := FHNCRelated;
    1169           PCEObj.CVRelated  := FCVRelated;  *)
     1172          PCEObj.CVRelated  := FCVRelated; *)
    11701173          if not FProcessingTemplate then
    11711174          begin
     
    12831286                                    if(FVitalsDate = 0) then
    12841287                                    begin
    1285                                       FVitalsDate := RemForm.PCEObj.VisitDateTime;
    1286                                       StoreVitals := ValidVitalsDate(FVitalsDate, TRUE);
     1288                                      FVitalsDate := TRemData(TmpData.Objects[i]).Parent.VitalDateTime;
     1289                                      StoreVitals := ValidVitalsDate(FVitalsDate, TRUE, FALSE);  //AGP Change 26.1
    12871290                                      if (not StoreVitals) then break;
    12881291                                    end;
     
    13501353                  VitalList.Insert(0, VitalDateStr     + FloatToStr(FVitalsDate));
    13511354                  VitalList.Insert(1, VitalPatientStr  + Patient.DFN);
    1352                   VitalList.Insert(2, VitalLocationStr + IntToStr(Encounter.Location));
     1355                  if IntToStr(Encounter.Location) <> '0' then //AGP change 26.9
     1356                     VitalList.Insert(2, VitalLocationStr + IntToStr(Encounter.Location))
     1357                  else
     1358                     VitalList.Insert(2, VitalLocationStr + IntToStr(RemForm.PCEObj.Location));;
    13531359                  Tmp := ValAndStoreVitals(VitalList);
    13541360                  if (Tmp <> 'True') then
     
    15871593begin
    15881594  if FVitalsDate = 0 then
    1589     VitalsDate := RemForm.PCEObj.VisitDateTime
     1595    VitalsDate := FMNow  //AGP Change 26.1
    15901596  else
    15911597    VitalsDate := FVitalsDate;
Note: See TracChangeset for help on using the changeset viewer.