Changeset 460 for cprs/branches/foia-cprs/CPRS-Chart/fReminderDialog.pas
- Timestamp:
- Jul 6, 2008, 8:20:14 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
cprs/branches/foia-cprs/CPRS-Chart/fReminderDialog.pas
r459 r460 11 11 TfrmRemDlg = class(TForm) 12 12 sb1: TScrollBox; 13 sb2: TScrollBox; 14 splTxtData: TSplitter; 15 Label1: TLabel; 16 pnlFrmBottom: TPanel; 13 17 pnlBottom: TPanel; 18 splText: TSplitter; 14 19 reData: TRichEdit; 15 20 reText: TRichEdit; … … 20 25 btnNext: TButton; 21 26 btnFinish: TButton; 22 sb2: TScrollBox;23 splTxtData: TSplitter;24 splText: TSplitter;25 27 btnClinMaint: TButton; 28 btnVisit: TButton; 26 29 lblFootnotes: TStaticText; 27 btnVisit: TButton;28 Label1: TLabel;29 30 procedure FormClose(Sender: TObject; var Action: TCloseAction); 30 31 procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean); … … 368 369 reData.Color := ReadOnlyColor; 369 370 reText.Color := ReadOnlyColor; 370 (*FSCCond := EligbleConditions;371 FSCRelated := SCC_NA; AGP Change 25.2371 FSCCond := EligbleConditions; 372 (* FSCRelated := SCC_NA; 372 373 FAORelated := SCC_NA; 373 FIRRelated := SCC_NA; 374 FIRRelated := SCC_NA; AGP Change 25.2 374 375 FECRelated := SCC_NA; 375 376 FMSTRelated := SCC_NA; … … 377 378 FCVRelated := SCC_NA; 378 379 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); *) 380 381 NotifyWhenRemindersChange(RemindersChanged); 381 382 RemForm.Drawers.NotifyWhenRemTreeChanges(RemindersChanged); … … 504 505 begin 505 506 Box := GetBox(TRUE); 506 if Box.ControlCount > 0 then ClearControls; //AGP Change 2 5.7this change should507 if Box.ControlCount > 0 then ClearControls; //AGP Change 26.1 this change should 507 508 //resolve the problem with Duplicate CheckBoxes 508 509 //appearing on some reminder dialogs CQ #2843 … … 754 755 msg, RemWipe: string; 755 756 756 begin 757 //AGP 25.11 Move RemWipe section to cancel button to 757 758 begin 759 //AGP 25.11 Added RemWipe section to cancel button to 758 760 //flag the patient specific dialog to be destroy if not in process. 759 761 RemWipe := ''; … … 761 763 begin 762 764 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); 764 766 end 765 767 else … … 769 771 for i := 0 to RemindersInProcess.Count-1 do 770 772 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 772 775 begin 773 776 if RemWipe ='' then RemWipe := TReminder(RemindersInProcess.Objects[i]).IEN … … 1040 1043 begin 1041 1044 Rem := FReminder; 1042 if Piece(Rem.DlgData,U,3)='1'then1045 if Rem.RemWipe = 1 then 1043 1046 RemWipe := Piece(Rem.DlgData,U,1); 1044 1047 end … … 1046 1049 begin 1047 1050 Rem := TReminder(RemindersInProcess.Objects[i]); 1048 if Piece(TReminder(RemindersInProcess.Objects[i]).RemData,U,11)='1'then1051 if TReminderDialog(TReminder(RemindersInProcess.Objects[i])).RemWipe = 1 then 1049 1052 begin 1050 1053 if RemWipe ='' then RemWipe := TReminder(RemindersInProcess.Objects[i]).IEN … … 1158 1161 begin 1159 1162 PCEObj := RemForm.PCEObj; 1160 (* AGP Change 25.2 Remove this section base on the Clinical Workgroup decision1161 if FSCPrompt and (ndSC in PCEObj.NeededPCEData) then1163 (* AGP CHANGE 23.2 Remove this section base on the Clinical Workgroup decision 1164 if FSCPrompt and (ndSC in PCEObj.NeededPCEData) then 1162 1165 btnVisitClick(nil); 1163 1166 PCEObj.SCRelated := FSCRelated; … … 1167 1170 PCEObj.MSTRelated := FMSTRelated; 1168 1171 PCEObj.HNCRelated := FHNCRelated; 1169 PCEObj.CVRelated := FCVRelated; 1172 PCEObj.CVRelated := FCVRelated; *) 1170 1173 if not FProcessingTemplate then 1171 1174 begin … … 1283 1286 if(FVitalsDate = 0) then 1284 1287 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 1287 1290 if (not StoreVitals) then break; 1288 1291 end; … … 1350 1353 VitalList.Insert(0, VitalDateStr + FloatToStr(FVitalsDate)); 1351 1354 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));; 1353 1359 Tmp := ValAndStoreVitals(VitalList); 1354 1360 if (Tmp <> 'True') then … … 1587 1593 begin 1588 1594 if FVitalsDate = 0 then 1589 VitalsDate := RemForm.PCEObj.VisitDateTime1595 VitalsDate := FMNow //AGP Change 26.1 1590 1596 else 1591 1597 VitalsDate := FVitalsDate;
Note:
See TracChangeset
for help on using the changeset viewer.