diff --git a/打卷检验管理/U_MJManageNewFDNew.pas b/打卷检验管理/U_MJManageNewFDNew.pas
index 278e61f..f7a7158 100644
--- a/打卷检验管理/U_MJManageNewFDNew.pas
+++ b/打卷检验管理/U_MJManageNewFDNew.pas
@@ -473,7 +473,7 @@ begin
     Exit;
   end;
 
-  if FileExists(fPrintFile) then                      
+  if FileExists(fPrintFile) then
   begin
     RMVariables['QRBARCODE'] := fImagePath;
     RM2.LoadFromFile(fPrintFile);
@@ -926,7 +926,7 @@ var
   maxno, FMJID, BZID, strsql, CFMJXH, GMJXH, GMJLen, GMJMaoZ, GMJQty4, Gmjstr4: string;
   FMJLen: Double;
   FOrder: Integer;
-begin
+begin                                       
 
   result := false;
   if PState = 1 then
@@ -1304,7 +1304,7 @@ begin
         Close;
         SQL.Clear;
         sql.Add('select Top 1 MJXH,MJID from WFB_MJJY A  ');
-        sql.Add(' where A.mainID=''' + Trim(FMainId) + ''' and  isnull(A.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
+        sql.Add(' where A.mainID=''' + Trim(FMainId) + ''' and A.subid=''' + Trim(FsubId) + ''' and  isnull(A.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
         sql.Add(' order by MJXH Desc');
         Open;
       end;
@@ -1369,7 +1369,7 @@ begin
       begin
         Close;
         sql.Clear;
-        sql.Add('select subid,MJStr4,MJXH from WFB_MJJY X where X.mainID=''' + Trim(FMainId) + ''' and isnull(X.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
+        sql.Add('select subid,MJStr4,MJXH from WFB_MJJY X where X.mainID=''' + Trim(FMainId) + '''  and X.subid=''' + Trim(Fsubid) + ''' and isnull(X.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
         sql.Add(' Group by subid,MJStr4,MJXH having count(*)>1');
         Open;
       end;