diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm
index f4e88dc..f6369b7 100644
--- a/检验管理/U_JYOrderCDOne.dfm
+++ b/检验管理/U_JYOrderCDOne.dfm
@@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     Left = 0
     Top = 0
     Width = 1384
-    Height = 92
+    Height = 62
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 119
@@ -101,28 +101,27 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Top = 0
       Caption = #25209#37327#20462#25913#32568#21495
       ImageIndex = 54
-      Wrap = True
       OnClick = ToolButton11Click
     end
     object TBDW: TToolButton
-      Left = 0
-      Top = 30
+      Left = 608
+      Top = 0
       AutoSize = True
       Caption = #20462#25913#25968#37327#21333#20301
       ImageIndex = 54
       OnClick = TBDWClick
     end
     object ToolButton4: TToolButton
-      Left = 111
-      Top = 30
+      Left = 719
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#35843#25972#31859#25968
       ImageIndex = 54
       OnClick = ToolButton4Click
     end
     object ToolButton13: TToolButton
-      Left = 222
-      Top = 30
+      Left = 830
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#20928#37325#36716#38271#24230
       ImageIndex = 54
@@ -130,23 +129,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton13Click
     end
     object ToolButton8: TToolButton
-      Left = 345
-      Top = 30
+      Left = 953
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#20462#25913#30382#37325
       ImageIndex = 54
       OnClick = ToolButton8Click
     end
     object ToolButton1: TToolButton
-      Left = 456
-      Top = 30
+      Left = 1064
+      Top = 0
       AutoSize = True
       Caption = #25171#21360#26631#31614
       ImageIndex = 96
+      Wrap = True
       OnClick = ToolButton1Click
     end
     object TCPDB: TToolButton
-      Left = 543
+      Left = 0
       Top = 30
       AutoSize = True
       Caption = #25104#21697#25171#21253
@@ -155,7 +155,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = TCPDBClick
     end
     object ToolButton3: TToolButton
-      Left = 630
+      Left = 87
       Top = 30
       AutoSize = True
       Caption = #25171#21360#21253#26631#31614
@@ -164,25 +164,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton3Click
     end
     object ToolButton2: TToolButton
-      Left = 729
+      Left = 186
       Top = 30
       AutoSize = True
       Caption = #25171#21360#26816#39564#25253#21578
       ImageIndex = 12
-      Wrap = True
       OnClick = ToolButton2Click
     end
     object ToolButton5: TToolButton
-      Left = 0
-      Top = 60
+      Left = 297
+      Top = 30
       AutoSize = True
       Caption = #25171#21360
       ImageIndex = 12
       OnClick = ToolButton5Click
     end
     object Edit3: TEdit
-      Left = 63
-      Top = 60
+      Left = 360
+      Top = 30
       Width = 68
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -196,8 +195,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnKeyPress = Edit3KeyPress
     end
     object ComboBox1: TComboBox
-      Left = 131
-      Top = 63
+      Left = 428
+      Top = 33
       Width = 149
       Height = 24
       Style = csDropDownList
@@ -221,8 +220,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         #26816#39564#30721#21333)
     end
     object Edit4: TEdit
-      Left = 280
-      Top = 60
+      Left = 577
+      Top = 30
       Width = 121
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -235,40 +234,40 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Visible = False
     end
     object ToolButton12: TToolButton
-      Left = 401
-      Top = 60
+      Left = 698
+      Top = 30
       Caption = #20462#25913#30721#21333
       ImageIndex = 54
       Visible = False
       OnClick = ToolButton12Click
     end
     object ToolButton9: TToolButton
-      Left = 520
-      Top = 60
+      Left = 817
+      Top = 30
       AutoSize = True
       Caption = #24322#24120#25968#25454
       ImageIndex = 2
       OnClick = ToolButton9Click
     end
     object TBExport: TToolButton
-      Left = 607
-      Top = 60
+      Left = 904
+      Top = 30
       AutoSize = True
       Caption = #23548#20986
       ImageIndex = 75
       OnClick = TBExportClick
     end
     object TBClose: TToolButton
-      Left = 670
-      Top = 60
+      Left = 967
+      Top = 30
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 55
       OnClick = TBCloseClick
     end
     object ToolButton14: TToolButton
-      Left = 733
-      Top = 60
+      Left = 1030
+      Top = 30
       Caption = #25209#37327#20462#25913#31995#25968
       ImageIndex = 56
       OnClick = ToolButton14Click
@@ -276,7 +275,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object Panel1: TPanel
     Left = 0
-    Top = 92
+    Top = 62
     Width = 1384
     Height = 88
     Align = alTop
@@ -791,9 +790,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 180
+    Top = 150
     Width = 1384
-    Height = 522
+    Height = 552
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas
index 190d6c9..b4cb40a 100644
--- a/检验管理/U_JYOrderCDOne.pas
+++ b/检验管理/U_JYOrderCDOne.pas
@@ -1,7 +1,7 @@
 unit U_JYOrderCDOne;
 
-interface                                            
-                             
+interface
+
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, StdCtrls, ExtCtrls, ComCtrls, ToolWin, cxStyles, cxCustomData,
@@ -476,7 +476,7 @@ end;
 
 procedure TfrmJYOrderCDOne.InitForm();
 var
-  fsj, Strmd: string;
+  fsj, Strmd: string;                                     
 begin
   ReadCxGrid('���鱨��JF', Tv1, '�������');
   fsj := 'select distinct(Filler) name from WFB_MJJY   ';
@@ -1610,12 +1610,12 @@ begin
       sql.Clear;
       sql.add('exec P_Do_PrintMd_HZ ');
       sql.add('@mainID=' + quotedstr(Trim('')));
-      sql.add(',@DName=' + quotedstr(Trim(DCode)));
+      sql.add(',@DName=' + quotedstr(Trim(DCode)));                                   
       sql.add(',@flag=''44'' ');
       Open;
     end;
   end;
-  if (trim(ComboBox1.Text) = '�����뵥(Ӣ��)') or (trim(ComboBox1.Text) = '��Լ����뵥') then
+  if (trim(ComboBox1.Text) = '�����뵥(Ӣ��)') or (trim(ComboBox1.Text) = '��Լ����뵥')  then
   begin
     with ADOQueryTemp do
     begin
@@ -1638,6 +1638,30 @@ begin
       sql.add(',@flag=''2'' ');
       Open;
     end;
+  end;
+    if   (trim(ComboBox1.Text) = '��Լ����뵥2') then
+  begin
+    with ADOQueryTemp do
+    begin
+      Close;                                             
+      sql.Clear;
+      sql.add('exec P_Print_CKMDHAEIL ');
+      sql.add('@DName=' + quotedstr(Trim(DCode)));
+      Open;
+    end;
+    SCreateCDS20(ADOQueryTemp, CDS_HZ);
+    SInitCDSData20(ADOQueryTemp, CDS_HZ);
+
+    with ADOQueryPrint do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Do_PrintMd_HZ ');
+      sql.add('@mainID=' + quotedstr(Trim('')));
+      sql.add(',@DName=' + quotedstr(Trim(DCode)));
+      sql.add(',@flag=''22'' ');
+      Open;
+    end;
   end;
   if (trim(ComboBox1.Text) = '�����뵥(����)') or (trim(ComboBox1.Text) = '�����뵥(����)') then
   begin