diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java
index d87a44a..cc2f596 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java
@@ -391,7 +391,22 @@ public class DmYdjh implements Serializable {
     private Long hxCount;
     @TableField(exist = false)
     private Long qgCount;
-
+    @TableField(exist = false)
+    private Long qgCount1k;
+    @TableField(exist = false)
+    private Long qgCount2k;
+    @TableField(exist = false)
+    private Long qgCount3k;
+    @TableField(exist = false)
+    private Long qgCount4k;
+    @TableField(exist = false)
+    private Long qgCount1kw;
+    @TableField(exist = false)
+    private Long qgCount2kw;
+    @TableField(exist = false)
+    private Long qgCount3kw;
+    @TableField(exist = false)
+    private Long qgCount4kw;
     public String getUniqueData(){
         return StrUtil.format("{}_{}_{}_{}",this.dcCh,this.dcPl,this.dcFd,this.tzbh);
     }
diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
index 20819a5..82f6745 100644
--- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
@@ -959,16 +959,22 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
 
 
     <select id="getydjhhz" parameterType="string" resultType="com.dsic.gj_erp.bean.jhgk.DmYdjh">
+
         SELECT
         dm_ydjh.dc_ch,
         dm_ydjh.dc_pl,
         isnull( min (dm_ydjh.jssj) ,'')as jssj,
         isnull( min (dm_ydjh.sljhrq) ,'')as sljhrq,
 
-        isnull( min (dm_ydjh.pwjhrq) ,'')as pwjhrq,
-        isnull( min (dm_ydjh.lljhrq) ,'')as lljhrq,
-        isnull( min (dm_ydjh.hxjhrq) ,'')as hxjhrq,
-        isnull( min (dm_ydjh.qgjhrq) ,'')as qgjhrq,
+        --         isnull( min (dm_ydjh.pwjhrq) ,'')as pwjhrq,
+        --         isnull( min (dm_ydjh.lljhrq) ,'')as lljhrq,
+        --         isnull( min (dm_ydjh.hxjhrq) ,'')as hxjhrq,
+        --         isnull( min (dm_ydjh.qgjhrq) ,'')as qgjhrq,
+        isnull( min(CASE WHEN ISNULL(dm_ydjh.sljhrq, '') != '' THEN dm_ydjh.sljhrq END),'')as sljhrq,
+        isnull( min(CASE WHEN ISNULL(dm_ydjh.pwjhrq, '') != '' THEN dm_ydjh.pwjhrq END),'')as pwjhrq,
+        isnull( min(CASE WHEN ISNULL(dm_ydjh.lljhrq, '') != '' THEN dm_ydjh.lljhrq END),'')as lljhrq,
+        isnull( min(CASE WHEN ISNULL(dm_ydjh.hxjhrq, '') != '' THEN dm_ydjh.hxjhrq END),'')as hxjhrq,
+        isnull( min(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' THEN dm_ydjh.qgjhrq END),'')as qgjhrq,
         COUNT(dm_ydjh.id) AS bs,
         SUM(CASE WHEN ISNULL(dm_ydjh.slxhth, '') != '' THEN 1 ELSE 0 END) AS slxhth_count,
         SUM(CASE WHEN ISNULL(dm_ydjh.slfkry, '') != '' THEN 1 ELSE 0 END) AS sl_count,
@@ -976,10 +982,27 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
         SUM(CASE WHEN ISNULL(dm_ydjh.llfkrq, '') != '' THEN 1 ELSE 0 END) AS ll_count,
         SUM(CASE WHEN ISNULL(dm_ydjh.hxfkrq, '') != '' THEN 1 ELSE 0 END) AS hx_count,
         SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' THEN 1 ELSE 0 END) AS qg_count,
-        SUM(CASE WHEN ISNULL(dm_ydjh.ylbs, 'N') = 'Y' THEN 1 ELSE 0 END) AS ylbs
+        SUM(CASE WHEN ISNULL(dm_ydjh.ylbs, 'N') = 'Y' THEN 1 ELSE 0 END) AS ylbs,
+        SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and dm_ydjh.kw in (1,7,8)
+        THEN 1 ELSE 0 END) AS qg_count1k,
+        SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and dm_ydjh.kw in (10,11,12,2,5,9)
+        THEN 1 ELSE 0 END) AS qg_count2k,
+        SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and dm_ydjh.kw in (13,14,3,6)
+        THEN 1 ELSE 0 END) AS qg_count3k,
+        SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and dm_ydjh.kw in (15,4)
+        THEN 1 ELSE 0 END) AS qg_count4k,
+        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and dm_ydjh.kw in (1,7,8) and ISNULL(dm_ydjh.slxhth, '') != ''
+        THEN 1 ELSE 0 END) AS qg_count1kw,
+        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and dm_ydjh.kw in (10,11,12,2,5,9) and ISNULL(dm_ydjh.slxhth, '') != ''
+        THEN 1 ELSE 0 END) AS qg_count2kw,
+        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and dm_ydjh.kw in (13,14,3,6) and ISNULL(dm_ydjh.slxhth, '') != ''
+        THEN 1 ELSE 0 END) AS qg_count3kw,
+        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and dm_ydjh.kw in (15,4) and ISNULL(dm_ydjh.slxhth, '') != ''
+        THEN 1 ELSE 0 END) AS qg_count4kw
         FROM
         dm_ydjh
         where 1=1  AND lx='B' and  ( isnull(dm_ydjh.zt,'') != '-1'  or  isnull(dm_ydjh.zt,'') !='99'  )
+        and dm_ydjh.kw!='17'
         <if test=" dcCh!=null and dcCh!=''">
             and   dm_ydjh.dc_ch=#{dcCh}
         </if>
@@ -999,6 +1022,7 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
         order by     dc_ch,dc_pl,jssj
 
 
+
     </select>
 <!--    dm_ydjh.jssj,-->
 <!--    dm_ydjh.sljhrq,-->