diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm
index 0738147..4e7cbac 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
@@ -110,35 +110,34 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       AutoSize = True
       Caption = #25764#38144#20986#24211
       ImageIndex = 86
-      Wrap = True
       OnClick = ToolButton7Click
     end
     object ToolButton11: TToolButton
-      Left = 0
-      Top = 30
+      Left = 639
+      Top = 0
       Caption = #25209#37327#20462#25913#32568#21495
       ImageIndex = 54
       OnClick = ToolButton11Click
     end
     object TBDW: TToolButton
-      Left = 119
-      Top = 30
+      Left = 758
+      Top = 0
       AutoSize = True
       Caption = #20462#25913#25968#37327#21333#20301
       ImageIndex = 54
       OnClick = TBDWClick
     end
     object ToolButton4: TToolButton
-      Left = 230
-      Top = 30
+      Left = 869
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#35843#25972#31859#25968
       ImageIndex = 54
       OnClick = ToolButton4Click
     end
     object ToolButton13: TToolButton
-      Left = 341
-      Top = 30
+      Left = 980
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#20928#37325#36716#38271#24230
       ImageIndex = 54
@@ -146,15 +145,16 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton13Click
     end
     object ToolButton8: TToolButton
-      Left = 464
-      Top = 30
+      Left = 1103
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#20462#25913#30382#37325
       ImageIndex = 54
+      Wrap = True
       OnClick = ToolButton8Click
     end
     object ToolButton1: TToolButton
-      Left = 575
+      Left = 0
       Top = 30
       AutoSize = True
       Caption = #25171#21360#26631#31614
@@ -162,7 +162,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton1Click
     end
     object TCPDB: TToolButton
-      Left = 662
+      Left = 87
       Top = 30
       AutoSize = True
       Caption = #25104#21697#25171#21253
@@ -170,7 +170,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = TCPDBClick
     end
     object ToolButton3: TToolButton
-      Left = 749
+      Left = 174
       Top = 30
       AutoSize = True
       Caption = #25171#21360#21253#26631#31614
@@ -178,25 +178,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton3Click
     end
     object ToolButton2: TToolButton
-      Left = 848
+      Left = 273
       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 = 384
+      Top = 30
       AutoSize = True
       Caption = #25171#21360
       ImageIndex = 12
       OnClick = ToolButton5Click
     end
     object Edit3: TEdit
-      Left = 63
-      Top = 60
+      Left = 447
+      Top = 30
       Width = 68
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -210,8 +209,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnKeyPress = Edit3KeyPress
     end
     object ComboBox1: TComboBox
-      Left = 131
-      Top = 63
+      Left = 515
+      Top = 33
       Width = 149
       Height = 24
       Style = csDropDownList
@@ -235,8 +234,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         #26816#39564#30721#21333)
     end
     object Edit4: TEdit
-      Left = 280
-      Top = 60
+      Left = 664
+      Top = 30
       Width = 121
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -249,32 +248,32 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Visible = False
     end
     object ToolButton12: TToolButton
-      Left = 401
-      Top = 60
+      Left = 785
+      Top = 30
       Caption = #20462#25913#30721#21333
       ImageIndex = 54
       Visible = False
       OnClick = ToolButton12Click
     end
     object ToolButton9: TToolButton
-      Left = 520
-      Top = 60
+      Left = 904
+      Top = 30
       AutoSize = True
       Caption = #24322#24120#25968#25454
       ImageIndex = 2
       OnClick = ToolButton9Click
     end
     object TBExport: TToolButton
-      Left = 607
-      Top = 60
+      Left = 991
+      Top = 30
       AutoSize = True
       Caption = #23548#20986
       ImageIndex = 75
       OnClick = TBExportClick
     end
     object TBClose: TToolButton
-      Left = 670
-      Top = 60
+      Left = 1054
+      Top = 30
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 55
@@ -283,7 +282,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object Panel1: TPanel
     Left = 0
-    Top = 92
+    Top = 62
     Width = 1384
     Height = 88
     Align = alTop
@@ -806,9 +805,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 180
+    Top = 150
     Width = 1384
-    Height = 538
+    Height = 568
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas
index ec478f0..427a2a0 100644
--- a/打卷检验管理/U_JYOrderCDOne.pas
+++ b/打卷检验管理/U_JYOrderCDOne.pas
@@ -1133,8 +1133,8 @@ begin
     exit;
   end;
   try
-    Moudle := LoadLibrary('MakeQRBarcode.dll');    
-    @Makebar := GetProcAddress(Moudle, 'Make');                  
+    Moudle := LoadLibrary('MakeQRBarcode.dll');
+    @Makebar := GetProcAddress(Moudle, 'Make');
     @Mixtext := GetProcAddress(Moudle, 'MixText');
     Txt := Trim(Order_Main.fieldbyname('BaoID').AsString);
     fImagePath := ExtractFilePath(Application.ExeName) + 'image\temp.bmp';
@@ -1624,7 +1624,30 @@ begin
       Open;
     end;
   end;
+  if (trim(ComboBox1.Text) = '�����뵥') then
+  begin                                                                            
+    with ADOQueryTemp do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Print_CKMD_TS ');
+      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=''2'' ');
+      Open;
+    end;
+  end;
   if (trim(ComboBox1.Text) = '�����뵥(Ⱦɫ)') then
   begin
     with ADOQueryTemp do