diff --git a/打卷检验管理/TradeManage.dof b/打卷检验管理/TradeManage.dof
index 9047bd8..08bee95 100644
--- a/打卷检验管理/TradeManage.dof
+++ b/打卷检验管理/TradeManage.dof
@@ -136,6 +136,3 @@ ProductVersion=1.0.0.0
 Comments=
 [Excluded Packages]
 c:\program files\borland\delphi7\Bin\DBWEBXPRT.BPL=Borland Web Wizard Package
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
diff --git a/打卷检验管理/U_GetDllForm.pas b/打卷检验管理/U_GetDllForm.pas
index 9d8db82..3835045 100644
--- a/打卷检验管理/U_GetDllForm.pas
+++ b/打卷检验管理/U_GetDllForm.pas
@@ -80,11 +80,11 @@ begin
   IF trim(DataBaseStr)<>''then
   DConString := DataBaseStr;
 
-   DParameters1:='��Ȩ��';
+   //DParameters1:='��Ȩ��';
    //DCode:='ADMIN';
    //DName:='ADMIN';
 //   DParameters2:='��Ʒ����'; //12
-//   DParameters2:='����';
+   DParameters2:='����';
   if not ConnData() then
   begin
     result := 0;
@@ -335,7 +335,7 @@ begin
       end;
     19:  //���鱨��
       begin
-        if frmJYOrderCDOne = nil then          
+        if frmJYOrderCDOne = nil then
         begin
           frmJYOrderCDOne := TfrmJYOrderCDOne.Create(application.MainForm);
           with frmJYOrderCDOne do
diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm
index d6a017b..a2371b9 100644
--- a/打卷检验管理/U_JYOrderCDOne.dfm
+++ b/打卷检验管理/U_JYOrderCDOne.dfm
@@ -1,6 +1,6 @@
 object frmJYOrderCDOne: TfrmJYOrderCDOne
-  Left = 296
-  Top = 178
+  Left = 459
+  Top = 317
   Width = 1400
   Height = 757
   Caption = #26816#39564#25253#21578
@@ -21,7 +21,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1384
+    Width = 1392
     Height = 62
     AutoSize = True
     ButtonHeight = 30
@@ -204,10 +204,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Font.Name = #23435#20307
       Font.Style = []
       ItemHeight = 16
-      ItemIndex = 0
       ParentFont = False
       TabOrder = 0
-      Text = #26816#39564#30721#21333'('#33521#25991')'
       OnChange = ComboBox1Change
       Items.Strings = (
         #26816#39564#30721#21333'('#33521#25991')'
@@ -215,7 +213,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         #26816#39564#30721#21333'('#26579#33394')'
         #26816#39564#30721#21333'('#21360#33457')'
         #26816#39564#30721#21333'('#27719#24635')'
-        #26816#39564#30721#21333)
+        #26816#39564#30721#21333
+        #26816#39564#30721#21333'('#20013#25991#20116#21015')')
     end
     object Edit4: TEdit
       Left = 664
@@ -267,7 +266,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   object Panel1: TPanel
     Left = 0
     Top = 62
-    Width = 1384
+    Width = 1392
     Height = 88
     Align = alTop
     BevelInner = bvRaised
@@ -782,8 +781,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   object cxGrid1: TcxGrid
     Left = 0
     Top = 150
-    Width = 1384
-    Height = 568
+    Width = 1392
+    Height = 576
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
@@ -1316,8 +1315,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     end
   end
   object Panel3: TPanel
-    Left = 503
-    Top = 203
+    Left = 1127
+    Top = 171
     Width = 231
     Height = 216
     TabOrder = 6
diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas
index e41dd53..8d787d6 100644
--- a/打卷检验管理/U_JYOrderCDOne.pas
+++ b/打卷检验管理/U_JYOrderCDOne.pas
@@ -405,6 +405,7 @@ begin
         sql.add('and mjtype=''��Ʒ'' ');
       end;
       sql.add('order by A.mainid,B.prtcolor,gangno,A.mjxh');
+      
       Open;
     end;
     SCreateCDS20(ADOQueryMain, Order_Main);
@@ -558,6 +559,7 @@ begin
     v1Column22.visible := False;
 //    TCPDB.Visible:=False;
   end;
+  ComboBox1.ItemIndex := 0
 end;
 
 procedure TfrmJYOrderCDOne.Panel10MouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
@@ -1116,7 +1118,7 @@ end;
 
 procedure TfrmJYOrderCDOne.PRTCodeNameChange(Sender: TObject);
 begin
-  TBFind.Click;                     
+  TBFind.Click;
 end;
 
 procedure TfrmJYOrderCDOne.ToolButton3Click(Sender: TObject);
@@ -1158,7 +1160,7 @@ begin
           Order_Main.EnableControls;
           exit;
         end;
-        with ADOQueryPrint do              
+        with ADOQueryPrint do
         begin
           Close;
           SQL.Clear;
@@ -1692,6 +1694,31 @@ begin
     end;
   end;
 
+    if (trim(ComboBox1.Text) = '�����뵥(��������)') then
+  begin
+    with ADOQueryTemp do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Print_CKMDYDL_Chinese ');
+      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