diff --git a/复合检验管理/U_SCPersonColor.pas b/复合检验管理/U_SCPersonColor.pas
index 9e764f5..2b4757f 100644
--- a/复合检验管理/U_SCPersonColor.pas
+++ b/复合检验管理/U_SCPersonColor.pas
@@ -92,15 +92,15 @@ begin
     begin
       sql.Add('select AA.*,row_number () over (order by name) as keyNo from(select DISTINCT zdyname as name,note from kh_zdy where type=''PRTColor'')AA');
     end
-    else if FTYPE = 'HX' then
+    else if FTYPE = 'HX' then                   
     begin
       sql.Add('select AA.*,row_number () over (order by name) as keyNo from(select DISTINCT zdyname as name,note from kh_zdy where type=''PRTHX'')AA');
     end
     else if FTYPE = 'SH' then
     begin
-      sql.Add('select AA.*,row_number () over (order by cast(name as float)) as keyNo from(select DISTINCT note as name from kh_zdy where type=''PRTCodeName'' and zdyname=''' + Trim(FCXPM) + ''')AA');
+      sql.Add('select AA.*,row_number () over (order by name) as keyNo from(select DISTINCT note as name from kh_zdy where type=''PRTCodeName'' and zdyname=''' + Trim(FCXPM) + ''')AA');
 
-//      sql.Add('select AA.*,row_number () over (order by name) as keyNo from(select DISTINCT zdyname as name,note from kh_zdy where type=''SOrddefstr1'')AA');
+//      sql.Add('select AA.*,row_number () over (order by cast(name as float)) as keyNo from(select DISTINCT zdyname as name,note from kh_zdy where type=''SOrddefstr1'')AA');
     end;