zjh
2025-04-15 3acbfbf90dbaa7f87aa2d37405700a9abc08073a
zjh20250415
8个文件已修改
94 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/test/java/zjhTest.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -281,7 +281,8 @@
                jcbgdService.deletedLtkjJcbgdByTjhAndTmh(s);
                jcsqdService.saveBatch(jcsqdList);
                List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s);
                if(null !=jcsqdList && !jcsqdList.isEmpty()){
                jcycxmService.deletedByTjh(s);
                if(!jcsqdList.isEmpty()){
                    for (LtkjExamJcsqd jcsqd : jcsqdList) {
                        if(StringUtil.isNotBlank(jcsqd.getJgzt())){
                            String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|;|;");
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -877,14 +877,16 @@
                                }
                            }
                        }
                        LambdaQueryWrapper<TjXdtgmdjg> wq = new LambdaQueryWrapper<>();
                        /*        LambdaQueryWrapper<TjXdtgmdjg> wq = new LambdaQueryWrapper<>();
                        wq.eq(TjXdtgmdjg::getTjh, tjNumber);
                        List<TjXdtgmdjg> list = xdtgmdjgService.list(wq);
                        if (null != list && !list.isEmpty()) {
                            for (TjXdtgmdjg xdtgmdjg : list) {
                                pictureController.saveTjXdtgmdjgByJcbgd(xdtgmdjg);
                            }
                        }
                        }*/
                        if (StrUtil.isBlank(resultMsg))
                            return AjaxResult.success("同步成功");
                        else return AjaxResult.error(resultMsg);
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -1816,17 +1816,18 @@
        TjCustomer tjCustomer = tjCustomerService.getById( tjOrder.getUserId());
        LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
        we.eq(TjReport::getTjNumber, tjNumber);
        we.eq(TjReport::getType, "体检报告");
        TjReport one = tjReportService.getOne(we);
        if (one == null) {
            return;
        }
        String userId = SecurityUtils.getLoginUser().getUsername();
        PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_体检报告.pdf");
        String filePath = value + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_体检报告.pdf";
//        LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
//        we.eq(TjReport::getTjNumber, tjNumber);
//        we.eq(TjReport::getType, "体检报告");
//        TjReport one = tjReportService.getOne(we);
//        if (one == null) {
//            return;
//        }
//
//        String userId = SecurityUtils.getLoginUser().getUsername();
//        PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_体检报告.pdf");
//        String filePath = value + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_体检报告.pdf";
        String filePath = value + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_报告.pdf";
        File f = new File(filePath);
        if (filePath.isEmpty()) {
            System.out.println("文件不存在!");
@@ -1848,13 +1849,13 @@
                String contentType = u.openConnection().getContentType();
                response.setContentType(contentType);
                response.setHeader("Content-Disposition", "inline;filename="
                        + userId + tjNumber + ".pdf");
                        + tjCustomer.getCusId() + tjNumber + ".pdf");
            } else {
                // 纯下载方式
                response.setContentType("application/x-msdownload");
                response.setContentType("application/pdf;charset=utf-8");
                response.setHeader("Content-Disposition", "attachment;filename="
                        + userId + tjNumber + ".pdf");
                        + tjCustomer.getCusId() + tjNumber + ".pdf");
            }
            out = response.getOutputStream();
            while ((len = br.read(bs)) > 0) {
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
@@ -7,6 +7,7 @@
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
@@ -58,8 +59,10 @@
    //@PreAuthorize("@ss.hasPermi('hosp:rules:list')")
    @GetMapping("/list")
    @ApiOperation(value = "查询规则+病种列表")
    public TableDataInfo list(TjRules tjRules) {
        startPage();
    public AjaxResult list(TjRules tjRules) {
        Page<TjRules> page=new Page<>(tjRules.getPageNum(),tjRules.getPageSize());
        LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
        if (tjRules.getProId() != null) {
            List<TjProject> projects = projectService.getTjProjectListBySoneId(tjRules.getProId());
@@ -90,9 +93,12 @@
            wq.eq(TjRules::getSex, tjRules.getSex());
        }
        wq.orderByAsc(TjRules::getSort);
        List<TjRules> list = tjRulesService.list(wq);
        return getDataTable(list);
//        List<TjRules> list = tjRulesService.list(wq);
        Page<TjRules> page1 = tjRulesService.page(page, wq);
        Map<String,Object>map=new HashMap<>();
        map.put("rows",page1.getRecords());
        map.put("total",page1.getTotal());
        return AjaxResult.success(map);
    }
ltkj-admin/src/test/java/zjhTest.java
@@ -2,7 +2,9 @@
import cn.hutool.core.io.FileUtil;
import com.ltkj.LtkjApplication;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.TjJcycxm;
import com.ltkj.hosp.idutil.IdUtils;
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -70,8 +72,16 @@
        public static void main(String[] args) throws Exception {
            System.out.println(MatchUtils.isIdCard("622723197401030409"));
            System.out.println(MatchUtils.isMobileNO("15346732733"));
            String s = "L4/5、L5/S1椎间盘突出,腰椎椎体轻度骨质增生。";
            String[] split = s.replaceAll("\n", "").split("。|;|;");
            for (String jg : split) {
                if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                        && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")
                        && !jg.contains("未见明显")&& !jg.contains("正常")&& !jg.contains("双侧椎间孔无狭窄")){
                    System.out.println(1);
                }
            }
        }
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java
@@ -167,6 +167,12 @@
    @TableField(exist = false)
    private List<TjRuleAdvice> ruleAdvices;
    @TableField(exist = false)
    private Integer pageNum;
    @TableField(exist = false)
    private Integer pageSize;
    @Override
    public String toString() {
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
@@ -21,18 +21,18 @@
@DataSource(value = DataSourceType.MASTER)
public interface LtkjExamJcbgdMapper extends BaseMapper<LtkjExamJcbgd> {
    @Delete ("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh}  and lx=0 ")
    void  deletedLtkjJcbgdByTjhAndTmh(String tmh);
    @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh}  and lx=0 ")
    void deletedLtkjJcbgdByTjhAndTmh(String tmh);
    @Delete ("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tjh} and tmh=#{tmh} ")
    void  deletedLtkjJcbgdByTjhandtmh(@Param("tjh") String tjh,@Param("tmh") String tmh);
    @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tjh} and tmh=#{tmh}   and lx=1 ")
    void deletedLtkjJcbgdByTjhandtmh(@Param("tjh") String tjh, @Param("tmh") String tmh);
    @Select ("SELECT  a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='检查' GROUP BY a.sqdh")
    @Select("SELECT  a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='检查' GROUP BY a.sqdh")
    List<String> getJianJcBaoGaoDan(String cardId);
    @Select("SELECT * FROM ltkj_exam_jcbgd WHERE tmh=#{tmh} GROUP BY xmmc ")
    List<LtkjExamJcbgd> getJianJcBaoGaoDanList(String tmh);
@Select("SELECT * FROM ltkj_exam_jcbgd WHERE tjh=#{cardId}")
    @Select("SELECT * FROM ltkj_exam_jcbgd WHERE tjh=#{cardId}")
    List<LtkjExamJcbgd> getJianJcBaoGaoDanByTjh(String cardId);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
@@ -28,16 +28,17 @@
    @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh}  and lx=0 ")
    void  deletedLtkjJcsqdByTjhAndTmh(@Param("tjh")String tjh);
    @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and tmh=#{tmh}")
    @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and tmh=#{tmh}   and lx=1 ")
    void  deletedLtkjJcsqdByTjhandtmh(@Param("tjh") String tjh,@Param("tmh") String tmh);
    @Select("SELECT * FROM ltkj_exam_jcsqd a WHERE a.tjh=#{tjh}")
    List<LtkjExamJcsqd> getLtkjJcsqdByTjh(String tjh);
    @Insert("INSERT INTO  ltkj_exam_jcsqd \n" +
    @Insert("INSERT INTO  ltkj_exam_jcsqd (`tjh`, `tmh`, `jclx`, `jczlx`, `bgys`, `bgysid`, " +
            "`sqsj`, `jgsj`, `jcxmmc`, `jcxmid`, `bw`, `jgzt`, `jgbx`, `lx`, `create_time`)\n" +
            "SELECT a.tjh,a.tmh,NULL jclx,NULL jczlx,a.shysxm bgys,a.shysdm bgysid,a.sqsj,a.zdsj jgsj, a.xmmc jcxmmc,a.xmdm jcxmid,a.jcbw bw,\n" +
            "a.yxzd jgzt,a.bg_nr jgbx,sysdate()\n" +
            "a.yxzd jgzt,a.bg_nr jgbx,'0',sysdate()\n" +
            "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.xmmc")
    void saveLtkjExamJcsqd(String tjh);
@@ -59,7 +60,8 @@
    void deletedLtkjJcsqdByTjhAndProId(@Param("tjh") String tjh,@Param("xmid") String xmid);
    @Insert("INSERT INTO  ltkj_exam_jcsqd \n" +
    @Insert("INSERT INTO  ltkj_exam_jcsqd (`tjh`, `tmh`, `jclx`, `jczlx`, `bgys`, `bgysid`, `sqsj`, " +
            "`jgsj`, `jcxmmc`, `jcxmid`, `bw`, `jgzt`, `jgbx`, `lx`, `create_time`)\n" +
            "SELECT a.tjh,a.tmh,NULL jclx,NULL jczlx,a.shysxm bgys,a.shysdm bgysid,a.sqsj,a.zdsj jgsj, a.xmmc jcxmmc,a.xmdm jcxmid,a.jcbw bw,\n" +
            "a.yxzd jgzt,a.bg_nr jgbx,'1',sysdate()\n" +
            "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.xmmc")