Merge remote-tracking branch 'origin/master'

zjh

2025-05-19 7e73e7699d55b4b229bef4dc5d89e01aedef5a19

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java

@@ -58,12 +58,12 @@
    public TableDataInfo list(@RequestBody DictSfxm dictSfxm) {
        startPage();
        String pym = dictSfxm.getPym();
        if(null !=pym && !"".equals(pym)) {
        if(null !=pym && !pym.isEmpty()) {
            pym=dictSfxm.getPym().toUpperCase(Locale.ROOT);
            dictSfxm.setPym(pym);
        }
        List<DictSfxm> list = dictSfxmService.selectDictSfxmList(dictSfxm);
        if (null != list && list.size() > 0) {
        if (null != list && !list.isEmpty()) {
            for (DictSfxm sfxm : list) {
                DictHosp hosp = dictHospService.getById(sfxm.getYqid());
                if (null != hosp) {
@@ -188,7 +188,7 @@
                map.put("date", sfxmList);
                map.put("total", sfxms.size());
            } else {
                map.put("date", 0);
                map.put("date", null);
                map.put("total", 0);
            }
            return AjaxResult.success(map);
@@ -209,7 +209,7 @@
                map.put("date", sfxmList);
                map.put("total", sfx.size());
            } else {
                map.put("date", 0);
                map.put("date", null);
                map.put("total", 0);
            }
            return AjaxResult.success(map);