diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs
index ebe161c..a1207c5 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs
@@ -240,7 +240,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
                 if (!string.IsNullOrEmpty(wmeCode))   //焊接方法
                 {
-                    if (wmeCode.Contains(welderQualify.WeldingMethodId))
+                    if (welderQualify.WeldingMethodId.Contains(wmeCode))
                     {
                         okNum++;
                     }
@@ -373,14 +373,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
             var steel = BLL.HJGL_MaterialService.GetSteelBySteID(ste);
             var floorQ = from x in floorWelderQualifys
-                         where wmeCode1.Contains(x.WeldingMethodId)
+                         where x.WeldingMethodId.Contains(wmeCode1)
                          && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location)))
                          && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? ""))
                          && x.WeldType.Contains(weldType)
                          // && (dia == null || x.SizesMin<=dia)
                          select x;
             var cellQ = from x in cellWelderQualifys
-                        where wmeCode2.Contains(x.WeldingMethodId)
+                        where x.WeldingMethodId.Contains(wmeCode2)
                          && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location)))
                          && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? ""))
                          && x.WeldType.Contains(weldType)
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs
index f3c9782..6cdeb1a 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs
@@ -30,6 +30,7 @@
                 this.drpProject.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
                 this.drpProject.DataBind();
                 this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
+                Funs.FineUIPleaseSelect(this.drpProject);
 
                 var pUnit = BLL.Base_UnitService.GetUnitsByProjectUnitType(this.drpProject.SelectedValue, BLL.Const.UnitType_4);
                 ///单位
@@ -176,7 +177,14 @@
             {
                 listStr.Add(new SqlParameter("@EndDate", Convert.ToDateTime(this.txtEndDate.Text)));
             }
-            listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            if (this.drpProject.SelectedValue == BLL.Const._Null)
+            {
+                listStr.Add(new SqlParameter("@projectId", null));
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            }
             SqlParameter[] parameter = listStr.ToArray();
 
             //tb = (DataTable)CacheHelper.GetCache("HJGL_sp_rpt_iso_analyze");