diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java
index ed04380..e6878b0 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java
@@ -13,6 +13,7 @@ import com.dsic.gj_erp.bean.jcsj.DmCzplpNew;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.bean.kc.ImCkwpkwp;
 import com.dsic.gj_erp.exception.CustomException;
+import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper;
 import com.dsic.gj_erp.service.jcsj.DmCzplpNewService;
 import com.dsic.gj_erp.service.jhgk.DmYdjhService;
 import com.dsic.gj_erp.service.kc.ImCkwpkwpService;
@@ -53,6 +54,8 @@ public class DmYdjhController {
 
     @Autowired
     private DmCzplpNewService czplpNewService;
+    @Autowired
+    private DmYdjhMapper dmYdjhMapper;
 
     @PostMapping("save")
     public ResultBean<?> save(@RequestBody List<DmYdjh> list){
@@ -74,77 +77,24 @@ public class DmYdjhController {
 //            .orderByAsc("jssj,dc_ch,dc_pl,zl,lqlb")
 
             map.put("yf",DateUtil.beginOfMonth(DateUtil.parseDate(map.get("yf"))).toString("yyyy/MM/dd"));
+            map.put("yf1",DateUtil.endOfMonth(DateUtil.parseDate(map.get("yf"))).toString("yyyy/MM/dd"));
+        List<DmYdjh> getydjhhz = dmYdjhMapper.getydjhhz(map);
+        return new ResultBean(getydjhhz);
+    }
 
+    @RequestMapping("/getListhzBymx")
+    @AuthFunction
+    public ResultBean getListhzBymx(@RequestBody Map<String, String> map ) {
 
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");
+        List<DmYdjh> list= service.list(new QueryWrapper<DmYdjh>()
+            .eq(StrUtil.isNotEmpty(map.get("dcch")),"dc_ch",map.get("dcch"))
+            .eq(StrUtil.isNotEmpty(map.get("dcpl")),"dc_pl",map.get("dcpl"))
 
-//        Map<String, List<DmYdjh>> collect = list.stream().collect(Collectors.groupingBy(DmYdjh::getDcCh));
-//        List<Map<String, Object>> resultMap=new ArrayList<>();
-        //验证数据获取方法,后续可以都在这里进行获取
-//        collect.forEach((key,val)->{
-//            List<ImCkwpkwp> bcKcxx = kcService.getBcKcxx(key);
-//            List<DmCzplpNew> czplpNewList = czplpNewService.list(Wrappers.<DmCzplpNew>lambdaQuery()
-//                    .eq(DmCzplpNew::getDcCh, key)
-//            );
-//
-//            val.forEach(item->{
-//                Map<String, Object> itemMap = BeanUtil.beanToMap(item);
-//                resultMap.add(itemMap);
-//                bcKcxx.forEach(kc->{
-//                    if (item.getDcCh().equals(kc.getDcCh())
-//                            &&item.getDcFd().equals(kc.getDcPl())
-//                            &&item.getTzbh().equals(kc.getDcTh())){
-//                        itemMap.put("kc",kc);
-//                    }
-//                });
-//                czplpNewList.forEach(czplpNew->{
-//                    if (item.getDcCh().equals(czplpNew.getDcCh())&&item.getDcPl().equals(czplpNew.getDcPl())) {
-//                        /// 判断颜色
-//                        itemMap.put("czplpNew", czplpNew);
-////                        if (StringUtils.isBlank(czplpNew.getXfqLqb())|| StringUtils.isBlank(item.getSlrq())) {
-////                            // corlor  red
-////                            itemMap.put("color", "red");
-////                        } else {
-////                            DateTime dateStr1 = DateUtil.parse(czplpNew.getXfqLqb(), "yyyy/MM/dd");
-////                            DateTime dateStr2 = DateUtil.parse(item.getSlrq(), "yyyy/MM/dd");
-////                            int result = DateUtil.compare(dateStr1, dateStr2);
-////                            if (result > 0) {
-////                                System.out.println(dateStr1 + " is after " + dateStr2);
-////                                itemMap.put("color", "red");
-////                            } else if (result < 0) {
-////                                System.out.println(dateStr1 + " is before " + dateStr2);
-////
-////                            } else {
-////                                System.out.println(dateStr1 + " is equal to " + dateStr2);
-////                                itemMap.put("color", "yellow");
-////                            }
-////                        }
-////                        if (StringUtils.isBlank(czplpNew.getXfqTlt())||StringUtils.isBlank(item.getHxrq())) {
-////                            // corlor  yellow
-////                            itemMap.put("color", "red");
-////                        } else {
-////                            DateTime dateStr1 = DateUtil.parse(czplpNew.getXfqTlt(), "yyyy/MM/dd");
-////                            DateTime dateStr2 = DateUtil.parse(item.getHxrq(), "yyyy/MM/dd");
-////                            int result = DateUtil.compare(dateStr1, dateStr2);
-////                            if (result > 0) {
-////                                System.out.println(dateStr1 + " is after " + dateStr2);
-////                                itemMap.put("color", "red");
-////                            } else if (result < 0) {
-////                                System.out.println(dateStr1 + " is before " + dateStr2);
-////
-////                            } else {
-////                                System.out.println(dateStr1 + " is equal to " + dateStr2);
-////                                itemMap.put("color", "yellow");
-////                            }
-////                        }
-//                    }else {
-//                      //  itemMap.put("color", "red");
-//                    }
-//                });
-//            });
-//        });
-        return new ResultBean();
+            .orderByAsc("jssj,dc_ch,dc_pl,zl,lqlb")
+        );
+        return  new ResultBean(list);
     }
-
     @RequestMapping("/getList")
     @AuthFunction
     public ResultBean getList(@RequestBody Map<String, String> map ) {
diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
index 4e3bcf1..f2cce31 100644
--- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
@@ -858,7 +858,8 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
         SUM(CASE WHEN ISNULL(dm_ydjh.pwfkry, '') != '' THEN 1 ELSE 0 END) AS pw_count,
         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.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
         FROM
         dm_ydjh
         where 1=1
@@ -872,7 +873,7 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
             and dm_ydjh.jssj&gt;=#{yf}
         </if>
         <if test="yf != null and yf!=''">
-            and dm_ydjh.jssj&lt;=#{yf}
+            and dm_ydjh.jssj&lt;=#{yf1}
         </if>
         GROUP BY
         dm_ydjh.dc_ch,
@@ -883,7 +884,7 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
         dm_ydjh.lljhrq,
         dm_ydjh.hxjhrq,
         dm_ydjh.qgjhrq
-        order by     jssj,dc_ch,dc_pl,zl,lqlb
+        order by     dc_ch,dc_pl,jssj
 
 
     </select>