zjh20241205-3

zjh

2024-12-06 c42f62b32bac302a7ac9fcde7489f7c5fc6e11aa

zjh20241205-3

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

@@ -299,9 +299,10 @@
//            return error;
//        }
//        return AjaxResult.success("该用户体检未完成，不能打印报告！！！");
        String config = configService.selectConfigByKey("sfjcwjhyqxm");
        if(null != config && config.equalsIgnoreCase("Y")){
        int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
        if (num > 0) {
            return AjaxResult.error("有延期项目暂不能生成报告!!!");
            if (num > 0) return AjaxResult.error("存在未检或延期项目暂不能生成报告!!!");
        }

//        String configByKey = configService.selectConfigByKey("sfkqdyhis");

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java

@@ -246,7 +246,7 @@
            "  NULL bbbh,\n" +
            "  NULL bbmc,\n" +
            "  a.SFXMID xmid,\n" +
            "  a.SFXMNAME xmmc,\n" +
            "  REPLACE(a.SFXMNAME,'tj_','') xmmc,\n" +
            "  a.SENDDATE sqsj,\n" +
            "  a.SENDDOCTOR sqys,\n" +
            "  a.CHECKDATE jgsj,\n" +
@@ -302,7 +302,7 @@
            "  NULL bgysid,\n" +
            "  a.SQRJ sqsj,\n" +
            "  a.BGSJ jgsj,\n" +
            "  a.JCMC jcxmmc,\n" +
            "  REPLACE(a.JCMC,'tj_','') jcxmmc,\n" +
            "  a.JCMCID jcxmid,\n" +
            "  a.JCBW bw,\n" +
            "  TRIM(a.JCJL) jgzt,\n" +