diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/Ydjhzz.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/Ydjhzz.java
index 0cef5fa..4f684f8 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/Ydjhzz.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/Ydjhzz.java
@@ -159,67 +159,156 @@ public class Ydjhzz implements Serializable {
     @ApiModelProperty(value = "合计板数")
     private Double hjbs;
 
+    private Double bclqzl_lm1;
+
+    private Double bclqzl_s1;
+
+    private Double bclqzl_sx2;
+
+    private Double bclqzl_szd2;
+
+    private Double bclqzl_xf;
+
+    private Double bclqzl_df;
+
+    private Double bclqzl_xzhb;
+
+    private Double bclqzl_dzhb;
+
+    private Double bclqzl_sx4;
+
+    private Double bclqzl_jz4;
+
+    private Double bclqzl_xm;
+
+    private Double bclqzl_dm;
+
+    private Double bclqzl_sx3;
+
+    private Double bclqzl_sj3;
+
+    private Double bclqzl_szd3;
+
+    private Double bclqzl_xz;
+
+    private Double bclqzl_dz;
+
+    private Double bclqzl_szd4;
+
+    private Double bclqzl_sq2x;
+
+    private Double bclqzl_sq2d;
+
+    private Double bclqzl_xq3;
+
+    private Double bclqzl_dq3;
+
+    private Double bclqzl_gd;
+
+    private Double bclqzl_xflj;
+
+    private Double bclqzl_dflj;
+
+    private Double bcshzl_lm1;
+
+    private Double bcshzl_s1;
+
+    private Double bcshzl_sx2;
+
+    private Double bcshzl_szd2;
+
+    private Double bcshzl_xf;
+
+    private Double bcshzl_df;
+
+    private Double bcshzl_xzhb;
+
+    private Double bcshzl_dzhb;
+
+    private Double bcshzl_sx4;
+
+    private Double bcshzl_jz4;
+
+    private Double bcshzl_xm;
+
+    private Double bcshzl_dm;
+
+    private Double bcshzl_sx3;
+
+    private Double bcshzl_sj3;
+
+    private Double bcshzl_szd3;
+
+    private Double bcshzl_xzxc;
+
+    private Double bcshzl_xz;
+
+    private Double bcshzl_dzxc;
+
+    private Double bcshzl_dz;
+
+    private Double bcshzl_fg;
+
+    private Double bcshzl_szd4;
+
+    private Double bcshzl_sq2x;
+
+    private Double bcshzl_sq2d;
+
+    private Double bcshzl_xq3;
+
+    private Double bcshzl_dq3;
+
+    private Double bcshzl_gd;
+
+    private Double bcshzl_xflj;
+
+    private Double bcshzl_dflj;
+    private Double lqhj_xz;
+    private Double lqhj_dz;
+    private Double shhj_xz;
+    private Double shhj_dz;
     public Double getXchdw(){
-        Double d= ObjectUtil.isEmpty(this.xzdw)?0.0:this.xzdw
-                +(ObjectUtil.isEmpty(this.dzdw)?0.0:this.dzdw)
-                +(ObjectUtil.isEmpty(this.fgdw)?0.0:this.fgdw);
-        BigDecimal d1 = new BigDecimal(d);
-        return d1.setScale(1,BigDecimal.ROUND_HALF_UP).doubleValue();
+        Double[] d= {xzdw,dzdw,fgdw};
+        return add(d);
     }
     public Double getHdw(){
-        Double  d=ObjectUtil.isEmpty(lmdw)?0.0:this.lmdw
-                +(ObjectUtil.isEmpty(s1dw)?0.0:this.s1dw)
-                +(ObjectUtil.isEmpty(sx2dw)?0.0:this.sx2dw)
-                +(ObjectUtil.isEmpty(szd2dw)?0.0:this.szd2dw)
-                +(ObjectUtil.isEmpty(xfdw)?0.0:this.xfdw)
-                +(ObjectUtil.isEmpty(dfdw)?0.0:this.dfdw)
-                +(ObjectUtil.isEmpty(xzhbdw)?0.0:this.xzhbdw)
-                +(ObjectUtil.isEmpty(dzhbdw)?0.0:this.dzhbdw)
-                +(ObjectUtil.isEmpty(sx4dw)?0.0:this.sx4dw)
-                +(ObjectUtil.isEmpty(jz4dw)?0.0:this.jz4dw)
-                +(ObjectUtil.isEmpty(xmdw)?0.0:this.xmdw)
-                +(ObjectUtil.isEmpty(dmdw)?0.0:this.dmdw)
-                +(ObjectUtil.isEmpty(sx3dw)?0.0:this.sx3dw)
-                +(ObjectUtil.isEmpty(sj3dw)?0.0:this.sj3dw)
-                +(ObjectUtil.isEmpty(szd3dw)?0.0:this.szd3dw)
-                +(ObjectUtil.isEmpty(xchdw)?0.0:this.xchdw);
-        BigDecimal d1 = new BigDecimal(d);
-        return d1.setScale(1,BigDecimal.ROUND_HALF_UP).doubleValue();
+        Double[]  d= {lmdw,s1dw,sx2dw,szd2dw,xfdw,dfdw,xzhbdw,dzhbdw,sx4dw,jz4dw,xmdw,dmdw,sx3dw,sj3dw,szd3dw,xchdw};
+        return add(d);
     }
-
     public Double getHdw1(){
-        Double  d=ObjectUtil.isEmpty(szd4dw)?0.0:this.szd4dw
-                +(ObjectUtil.isEmpty(sq2ddw)?0.0:this.sq2ddw)
-                +(ObjectUtil.isEmpty(sq2xdw)?0.0:this.sq2xdw)
-                +(ObjectUtil.isEmpty(xq3dw)?0.0:this.xq3dw)
-                +(ObjectUtil.isEmpty(dq3dw)?0.0:this.dq3dw)
-                +(ObjectUtil.isEmpty(gdDw)?0.0:this.gdDw);
-        Double d1 = new BigDecimal(d).setScale(1,BigDecimal.ROUND_HALF_UP).doubleValue();
-        return d1;
+        Double[]  d={szd4dw,sq2ddw,sq2xdw,xq3dw,dq3dw,gdDw};
+        return add(d);
     }
     public Double getHjbs(){
-            Double  d=ObjectUtil.isEmpty(lm1)?0.0:this.lm1
-                    +(ObjectUtil.isEmpty(s1)?0.0:this.s1)
-                    +(ObjectUtil.isEmpty(sx2)?0.0:this.sx2)
-                    +(ObjectUtil.isEmpty(szd2)?0.0:this.szd2)
-                    +(ObjectUtil.isEmpty(xf)?0.0:this.xf)
-                    +(ObjectUtil.isEmpty(df)?0.0:this.df)
-                    +(ObjectUtil.isEmpty(xzhb)?0.0:this.xzhb)
-                    +(ObjectUtil.isEmpty(dzhb)?0.0:this.dzhb)
-                    +(ObjectUtil.isEmpty(sx4)?0.0:this.sx4)
-                    +(ObjectUtil.isEmpty(jz4)?0.0:this.jz4)
-                    +(ObjectUtil.isEmpty(xm)?0.0:this.xm)
-                    +(ObjectUtil.isEmpty(dm)?0.0:this.dm)
-                    +(ObjectUtil.isEmpty(sx3)?0.0:this.sx3)
-                    +(ObjectUtil.isEmpty(sj3)?0.0:this.sj3)
-                    +(ObjectUtil.isEmpty(szd3)?0.0:this.szd3)
-                +(ObjectUtil.isEmpty(szd4)?0.0:this.szd4)
-                +(ObjectUtil.isEmpty(sq2d)?0.0:this.sq2d)
-                +(ObjectUtil.isEmpty(sq2x)?0.0:this.sq2x)
-                +(ObjectUtil.isEmpty(xq3)?0.0:this.xq3)
-                +(ObjectUtil.isEmpty(dq3)?0.0:this.dq3)
-                +(ObjectUtil.isEmpty(gd)?0.0:this.gd);
+        Double[]  d= {lm1,s1,sx2,szd2,xf,df,xzhb,dzhb,sx4,jz4,xm,dm,sx3,sj3,szd3,szd4,sq2d,sq2x,xq3,dq3,gd};
+        return add(d);
+    }
+    public Double getLqhj_xz(){
+        Double[] arr= {bclqzl_lm1,bclqzl_s1,bclqzl_sx2,bclqzl_szd2,bclqzl_xf,bclqzl_df,bclqzl_xzhb,bclqzl_dzhb,bclqzl_sx4,bclqzl_jz4,bclqzl_xm,bclqzl_dm,bclqzl_sx3,bclqzl_sj3,bclqzl_szd3,bclqzl_xz,bclqzl_dz};
+        return add(arr);
+    }
+    public Double getShhj_xz(){
+        Double[] arr= {bcshzl_lm1,bcshzl_s1,bcshzl_sx2,bcshzl_szd2,bcshzl_xf,bcshzl_df,bcshzl_xzhb,bcshzl_dzhb,bcshzl_sx4,bcshzl_jz4,bcshzl_xm,bcshzl_dm,bcshzl_sx3,bcshzl_sj3,bcshzl_szd3,bcshzl_xz,bcshzl_dz};
+        return add(arr);
+    }
+    public Double getLqhj_dz(){
+        Double[] arr={bclqzl_szd4,bclqzl_sq2x,bclqzl_sq2d,bclqzl_xq3,bclqzl_dq3,bclqzl_gd};
+        return add(arr);
+    }
+    public Double getShhj_dz(){
+        Double[] arr= {bcshzl_szd4,bcshzl_sq2x,bcshzl_sq2d,bcshzl_xq3,bcshzl_dq3,bcshzl_gd};
+        return add(arr);
+    }
 
+    public Double add(Double [] arr){
+        Double d=0.0;
+        for (Double aDouble : arr) {
+            if (ObjectUtil.isNotEmpty(aDouble)){
+                d=d+aDouble;
+            }
+        }
+        d=new BigDecimal(d).setScale(1,BigDecimal.ROUND_HALF_UP).doubleValue();
         return d;
     }
 }
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java
index 73c3ea7..453fe1c 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java
@@ -39,6 +39,72 @@ public class YdjhzzController {
         return new ResultBean(list);
     }
 
+    public static  void main(String[] agrs){
+        String[] a= {"bclqzl_lm1",
+                "bclqzl_s1",
+                "bclqzl_sx2",
+                "bclqzl_szd2",
+                "bclqzl_xf",
+                "bclqzl_df",
+                "bclqzl_xzhb",
+                "bclqzl_dzhb",
+                "bclqzl_sx4",
+                "bclqzl_jz4",
+                "bclqzl_xm",
+                "bclqzl_dm",
+                "bclqzl_sx3",
+                "bclqzl_sj3",
+                "bclqzl_szd3",
+                "bclqzl_xzxc",
+                "bclqzl_xz",
+                "bclqzl_dzxc",
+                "bclqzl_dz",
+                "bclqzl_fg",
+                "bclqzl_szd4",
+                "bclqzl_sq2x",
+                "bclqzl_sq2d",
+                "bclqzl_xq3",
+                "bclqzl_dq3",
+                "bclqzl_gd",
+                "bclqzl_xflj",
+                "bclqzl_dflj",
+                "bcshzl_lm1",
+                "bcshzl_s1",
+                "bcshzl_sx2",
+                "bcshzl_szd2",
+                "bcshzl_xf",
+                "bcshzl_df",
+                "bcshzl_xzhb",
+                "bcshzl_dzhb",
+                "bcshzl_sx4",
+                "bcshzl_jz4",
+                "bcshzl_xm",
+                "bcshzl_dm",
+                "bcshzl_sx3",
+                "bcshzl_sj3",
+                "bcshzl_szd3",
+                "bcshzl_xzxc",
+                "bcshzl_xz",
+                "bcshzl_dzxc",
+                "bcshzl_dz",
+                "bcshzl_fg",
+                "bcshzl_szd4",
+                "bcshzl_sq2x",
+                "bcshzl_sq2d",
+                "bcshzl_xq3",
+                "bcshzl_dq3",
+                "bcshzl_gd",
+                "bcshzl_xflj",
+                "bcshzl_dflj",
+        };
+        for (String s : a) {
+//            System.out.println("    @TableField(\""+s+"\")\n" +
+//                    "    private Double "+s+";");
+
+            System.out.println("  <result column=\""+s+"\" property=\""+s+"\"/>");
+        }
+
+    }
 
 
 }
diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
index 6d8ebda..d1e4758 100644
--- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
@@ -1292,8 +1292,65 @@ END),           dm_ydjh.zyq1=	(CASE substring(RTRIM(dm_ydjh.tzbh),6,1)
                 END)
 where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
     </update>
-
-    <select id="getYdjhzz" resultType="com.dsic.gj_erp.bean.jcsj.Ydjhzz">
+    <resultMap id="ZZResultMap" type="com.dsic.gj_erp.bean.jcsj.Ydjhzz">
+        <result column="bclqzl_lm1" property="bclqzl_lm1"/>
+        <result column="bclqzl_s1" property="bclqzl_s1"/>
+        <result column="bclqzl_sx2" property="bclqzl_sx2"/>
+        <result column="bclqzl_szd2" property="bclqzl_szd2"/>
+        <result column="bclqzl_xf" property="bclqzl_xf"/>
+        <result column="bclqzl_df" property="bclqzl_df"/>
+        <result column="bclqzl_xzhb" property="bclqzl_xzhb"/>
+        <result column="bclqzl_dzhb" property="bclqzl_dzhb"/>
+        <result column="bclqzl_sx4" property="bclqzl_sx4"/>
+        <result column="bclqzl_jz4" property="bclqzl_jz4"/>
+        <result column="bclqzl_xm" property="bclqzl_xm"/>
+        <result column="bclqzl_dm" property="bclqzl_dm"/>
+        <result column="bclqzl_sx3" property="bclqzl_sx3"/>
+        <result column="bclqzl_sj3" property="bclqzl_sj3"/>
+        <result column="bclqzl_szd3" property="bclqzl_szd3"/>
+        <result column="bclqzl_xzxc" property="bclqzl_xzxc"/>
+        <result column="bclqzl_xz" property="bclqzl_xz"/>
+        <result column="bclqzl_dzxc" property="bclqzl_dzxc"/>
+        <result column="bclqzl_dz" property="bclqzl_dz"/>
+        <result column="bclqzl_fg" property="bclqzl_fg"/>
+        <result column="bclqzl_szd4" property="bclqzl_szd4"/>
+        <result column="bclqzl_sq2x" property="bclqzl_sq2x"/>
+        <result column="bclqzl_sq2d" property="bclqzl_sq2d"/>
+        <result column="bclqzl_xq3" property="bclqzl_xq3"/>
+        <result column="bclqzl_dq3" property="bclqzl_dq3"/>
+        <result column="bclqzl_gd" property="bclqzl_gd"/>
+        <result column="bclqzl_xflj" property="bclqzl_xflj"/>
+        <result column="bclqzl_dflj" property="bclqzl_dflj"/>
+        <result column="bcshzl_lm1" property="bcshzl_lm1"/>
+        <result column="bcshzl_s1" property="bcshzl_s1"/>
+        <result column="bcshzl_sx2" property="bcshzl_sx2"/>
+        <result column="bcshzl_szd2" property="bcshzl_szd2"/>
+        <result column="bcshzl_xf" property="bcshzl_xf"/>
+        <result column="bcshzl_df" property="bcshzl_df"/>
+        <result column="bcshzl_xzhb" property="bcshzl_xzhb"/>
+        <result column="bcshzl_dzhb" property="bcshzl_dzhb"/>
+        <result column="bcshzl_sx4" property="bcshzl_sx4"/>
+        <result column="bcshzl_jz4" property="bcshzl_jz4"/>
+        <result column="bcshzl_xm" property="bcshzl_xm"/>
+        <result column="bcshzl_dm" property="bcshzl_dm"/>
+        <result column="bcshzl_sx3" property="bcshzl_sx3"/>
+        <result column="bcshzl_sj3" property="bcshzl_sj3"/>
+        <result column="bcshzl_szd3" property="bcshzl_szd3"/>
+        <result column="bcshzl_xzxc" property="bcshzl_xzxc"/>
+        <result column="bcshzl_xz" property="bcshzl_xz"/>
+        <result column="bcshzl_dzxc" property="bcshzl_dzxc"/>
+        <result column="bcshzl_dz" property="bcshzl_dz"/>
+        <result column="bcshzl_fg" property="bcshzl_fg"/>
+        <result column="bcshzl_szd4" property="bcshzl_szd4"/>
+        <result column="bcshzl_sq2x" property="bcshzl_sq2x"/>
+        <result column="bcshzl_sq2d" property="bcshzl_sq2d"/>
+        <result column="bcshzl_xq3" property="bcshzl_xq3"/>
+        <result column="bcshzl_dq3" property="bcshzl_dq3"/>
+        <result column="bcshzl_gd" property="bcshzl_gd"/>
+        <result column="bcshzl_xflj" property="bcshzl_xflj"/>
+        <result column="bcshzl_dflj" property="bcshzl_dflj"/>
+    </resultMap>
+    <select id="getYdjhzz" resultMap="ZZResultMap">
 
         SELECT
             dc_ch,
@@ -1311,6 +1368,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as lmdw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='7' THEN dm_ydjh.bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_lm1,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='7' THEN dm_ydjh.bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_lm1,
             SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='8' THEN 1 ELSE 0 END) as s1,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='8'
                                THEN
@@ -1319,6 +1378,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as s1dw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='8' THEN dm_ydjh.bclqzl ELSE 0 END)/1000 as decimal(18,1))  as bclqzl_s1,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='8' THEN dm_ydjh.bcshzl ELSE 0 END)/1000 as decimal(18,1))  as bcshzl_s1,
             SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='9' THEN 1 ELSE 0 END) as sx2,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='9'
                                THEN
@@ -1327,6 +1388,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as sx2dw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='9' THEN dm_ydjh.bclqzl ELSE 0 END)/1000 as decimal(18,1))  as bclqzl_sx2,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='9' THEN dm_ydjh.bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_sx2,
             SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='9' THEN 1 ELSE 0 END) as szd2,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='9'
                                THEN
@@ -1335,6 +1398,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as szd2dw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='9' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_szd2,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='9' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_szd2,
             SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='11' THEN 1 ELSE 0 END) as xf,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='11'
                                THEN
@@ -1343,6 +1408,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as xfdw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='11' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_xf,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='11' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_xf,
             SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='11' THEN 1 ELSE 0 END) as df,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='11'
                                THEN
@@ -1351,6 +1418,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as dfdw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='11' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_df,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='11' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_df,
             SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='14' THEN 1 ELSE 0 END) as xzhb,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='14'
                                THEN
@@ -1359,6 +1428,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as xzhbdw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='14' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_xzhb,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='14' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_xzhb,
             SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='14' THEN 1 ELSE 0 END) as dzhb,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='14'
                                THEN
@@ -1367,6 +1438,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as dzhbdw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='14' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_dzhb,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='14' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_dzhb,
             SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='15' THEN 1 ELSE 0 END) as sx4,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='15'
                                THEN
@@ -1375,6 +1448,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as sx4dw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl=  '1010' and dm_ydjh.kw='15' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_sx4,
+            CAST(SUM(CASE WHEN dm_ydjh.zl=  '1010' and dm_ydjh.kw='15' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_sx4,
             SUM(CASE WHEN dm_ydjh.zl= '4230' and dm_ydjh.kw='15' THEN 1 ELSE 0 END) as jz4,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '4230' and dm_ydjh.kw='15'
                                THEN
@@ -1383,6 +1458,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as jz4dw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '4230' and dm_ydjh.kw='15' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_jz4,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '4230' and dm_ydjh.kw='15' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_jz4,
             SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='5' THEN 1 ELSE 0 END) as xm,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='5'
                                THEN
@@ -1391,6 +1468,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as xmdw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='5' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_xm,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='5' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_xm,
             SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='5' THEN 1 ELSE 0 END) as dm,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='5'
                                THEN
@@ -1399,6 +1478,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as dmdw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='5' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_dm,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='5' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_dm,
             SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='6' THEN 1 ELSE 0 END) as sx3,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='6'
                                THEN
@@ -1407,6 +1488,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as sx3dw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='6' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_sx3,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='6' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_sx3,
             SUM(CASE WHEN dm_ydjh.zl= '4230' and dm_ydjh.kw='6' THEN 1 ELSE 0 END) as sj3,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '4230' and dm_ydjh.kw='6'
                                THEN
@@ -1415,6 +1498,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as sj3dw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '4230' and dm_ydjh.kw='6' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_sj3,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '4230' and dm_ydjh.kw='6' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_sj3,
             SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='6' THEN 1 ELSE 0 END) as szd3,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='6'
                                THEN
@@ -1423,8 +1508,14 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as szd3dw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='6' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_szd3,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='6' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_szd3,
             SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.lx!='B' THEN 1 ELSE 0 END) as xzgs,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.lx!='B' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_xz,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.lx!='B' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_xz,
             SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.lx!='B' THEN 1 ELSE 0 END) as dzgs,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.lx!='B' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_dz,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.lx!='B' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_dz,
             SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='15' THEN 1 ELSE 0 END) as szd4,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='15'
                                THEN
@@ -1433,6 +1524,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as szd4dw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='15' THEN bclqzl ELSE 0 END) /1000 as decimal(18,1)) as bclqzl_szd4,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='15' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_szd4,
             SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='10' THEN 1 ELSE 0 END) as sq2x,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='10'
                                THEN
@@ -1441,6 +1534,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as sq2xdw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='10' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_sq2x,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='10' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_sq2x,
             SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='10' THEN 1 ELSE 0 END) as sq2d,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='10'
                                THEN
@@ -1449,6 +1544,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as sq2ddw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='10' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_sq2d,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='10' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshl_sq2d,
             SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='13' THEN 1 ELSE 0 END) as xq3,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='13'
                                THEN
@@ -1457,6 +1554,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as xq3dw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='13' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_xq3,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1010' and dm_ydjh.kw='13' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_xq3,
             SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='13' THEN 1 ELSE 0 END) as dq3,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='13'
                                THEN
@@ -1465,6 +1564,8 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
                 END) as decimal(18,1)) as dq3dw,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='13' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_dq3,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='13' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_dq3,
             SUM(CASE WHEN dm_ydjh.kw='17' THEN 1 ELSE 0 END) as gd,
             CAST(SUM( CASE WHEN  dm_ydjh.kw='17'
                                THEN
@@ -1472,7 +1573,9 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                                                convert(integer,substring(dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1 ,charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1)  - charindex('*',dm_ydjh.WPGG,1)- 1 )) / 1000 *
                                                convert(integer,right(dm_ydjh.WPGG,len(dm_ydjh.WPGG )- charindex('*',dm_ydjh.WPGG,charindex('*',dm_ydjh.WPGG,1)+1) )) * 7.85 /1000000
                            ELSE 0
-                END) as decimal(18,1)) as gddw
+                END) as decimal(18,1)) as gddw,
+            CAST(SUM(CASE WHEN dm_ydjh.kw='17' THEN bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_gd,
+            CAST(SUM(CASE WHEN dm_ydjh.kw='17' THEN bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_gd
         from dm_ydjh
         WHERE zt='62'
           and dm_ydjh.dc_ch=#{ch}  GROUP BY dc_ch,dc_pl ORDER BY dc_pl