Changeset 1679 for cprs/trunk/CPRS-Chart/Consults/fConsultAct.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/Consults/fConsultAct.pas (modified) (6 diffs)

cprs/trunk/CPRS-Chart/Consults/fConsultAct.pas

@@ -153 +153 @@
   i: integer;
   OrdItmIEN: integer;
+  attention: string;                                                              //wat cq 15561
+  AList: TStringList;                                                             {WAT cq 19626}
 begin
  pnlSigFind.Visible := False;
@@ -158 +160 @@
  pnlComments.Visible := True;
  memComments.Clear;
+ AList := TStringList.Create;
+try                                                                               {WAT cq 19626}
  if IsProcedure then
    begin
@@ -183 +187 @@
  else
    begin
-     SortByPiece(TStringList(SvcList), U, 2);                                   {RV}
+     FastAssign(SvcList, AList);                                                  {WAT cq 19626}
+     SortByPiece(AList, U, 2);                                                    {WAT cq 19626}
+     //SortByPiece(TStringList(SvcList), U, 2);                                   {RV}
      for i := 0 to SvcList.Count - 1 do
         if (cboService.Items.IndexOf(Trim(Piece(SvcList.Strings[i], U, 2))) = -1) and   {RV}
@@ -200 +206 @@
              end ;
        end;
-     pnlForward.Visible := True ;        
+     pnlForward.Visible := True ;
    end ;
  if cboService.Items.Count = 1 then cboService.ItemIndex := 0;
  FToService := cboService.ItemIEN;
- cboAttentionOf.InitLongList('') ;
+ //wat cq 15561
+ //cboAttentionOf.InitLongList('') ;
+ FAttentionOf := ConsultRec.Attention;
+ attention := ExternalName(FAttentionOf,200);
+ cboAttentionOf.InitLongList(attention);
+ cboAttentionOf.SelectByIEN(FAttentionOf);
+ //end cq 15561
  with cboUrgency do
   begin
@@ -224 +236 @@
   cboPerson.OnNeedData := NewPersonNeedData;         //
   cboPerson.InitLongList(User.Name)  ;
-  cboPerson.SelectByIEN(User.DUZ);        
+  cboPerson.SelectByIEN(User.DUZ);
   ckAlert.Visible := False ;
   lblAutoAlerts.Visible := False;
   Result := True;
+finally
+  AList.Free;                                                                      {WAT cq 19626}
+end;
 end;
 
@@ -601 +616 @@
 begin
   case FUserLevel of
-    UL_NONE, UL_REVIEW:
-      begin
-        if FUserIsRequester then
-          x := TX_ALERT1 + TX_ALERT_SVC_USERS
-        else
-          x := TX_ALERT1 + TX_ALERT_PROVIDER + ' and to ' + TX_ALERT_SVC_USERS;
-      end;
-    UL_UPDATE, UL_ADMIN, UL_UPDATE_AND_ADMIN:
-      begin
-        if FUserIsRequester then
-          //x := TX_ALERT_NOBODY   Replace with following line
-          x := TX_ALERT1 + TX_ALERT_SVC_USERS
-        else
-          x := TX_ALERT1 + TX_ALERT_PROVIDER + '.';
-      end;
-    UL_UNRESTRICTED:
-      begin
-        if FUserIsRequester then
-          x := TX_ALERT1 + TX_ALERT_SVC_USERS
-        else
-          x := TX_ALERT1 + TX_ALERT_PROVIDER + ' and to ' + TX_ALERT_SVC_USERS;
-      end;
-  end;
-  lblAutoAlerts.Caption := x;
+     UL_NONE, UL_REVIEW:
+       begin
+         if FUserIsRequester then
+           x := TX_ALERT1 + TX_ALERT_SVC_USERS
+         else
+           x := TX_ALERT1 + TX_ALERT_PROVIDER + ' and to ' + TX_ALERT_SVC_USERS;
+       end;
+     UL_UPDATE, UL_ADMIN, UL_UPDATE_AND_ADMIN:
+       begin
+         if FUserIsRequester then
+           //x := TX_ALERT_NOBODY   Replace with following line
+            x := TX_ALERT1 + TX_ALERT_SVC_USERS
+         else
+           x := TX_ALERT1 + TX_ALERT_PROVIDER + '.';
+       end;
+     UL_UNRESTRICTED:
+       begin
+         if FUserIsRequester then
+           x := TX_ALERT1 + TX_ALERT_SVC_USERS
+         else
+           x := TX_ALERT1 + TX_ALERT_PROVIDER + ' and to ' + TX_ALERT_SVC_USERS;
+       end;
+   end;
+   lblAutoAlerts.Caption := x;
 end;