zjh20250429

zjh

2025-04-29 37964f92084e6803a480207846ed292146b0fcf0

zjh20250429

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java

@@ -3023,6 +3023,7 @@
                        }
                        tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
                        tjPdfVO.setPid(String.valueOf(tjProject.getProParentId()));
                        tjPdfVO.setXh(tjProject.getXh());
//                        LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
//                        wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber);
//                        wrapper.eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()));
@@ -3031,12 +3032,13 @@
                }
            }
            if(!tjPdfVOS.isEmpty()){
                tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
                tjPdfVOS = tjPdfVOS.stream()
                        .sorted(Comparator.comparingInt(
                                tjPdfVO -> tjPdfVO.getProName().length() // 根据名字的长度排序
                        ))
                        .collect(Collectors.toList());
//                tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
//                tjPdfVOS = tjPdfVOS.stream()
//                        .sorted(Comparator.comparingInt(
//                                tjPdfVO -> tjPdfVO.getProName().length() // 根据名字的长度排序
//                        ))
//                        .collect(Collectors.toList());
                tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getXh)).collect(Collectors.toList());
            }
            printReport.put(entry.getKey(), tjPdfVOS);
        }

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

@@ -162,4 +162,12 @@
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(tjProAdvicerulesService.deleteTjProAdvicerulesByIds(ids));
    }

    @GetMapping("/getTjProAdvicerulesKsList")
    @ApiOperation(value = "获取体检诊断建议科室列表接口")
    public AjaxResult getTjProAdvicerulesKsList() {
        List<String> tjProAdvicerulesKsList = tjProAdvicerulesService.getTjProAdvicerulesKsList();
        return AjaxResult.success(tjProAdvicerulesKsList);
    }

}

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

@@ -157,6 +157,7 @@
        if (checkType != null) {
            wq.eq(TjProject::getProCheckType, checkType);
        }
        wq.orderByAsc(TjProject::getXh);
        List<TjProject> tjProjects = tjProjectService.list(wq);
//        List<TjProject> tjProjects = tjProjectService.getAllChildListById(proId);
        if (tjProjects != null) {

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjPdfVO.java

@@ -48,4 +48,6 @@
     * 碳13id
     */
    private String pid;

    private Integer xh;
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java

@@ -127,6 +127,9 @@
    @ApiModelProperty(value = "项目状态")
    private Integer proStatus;

    @ApiModelProperty(value = "外送标志默认是0不外送，1是外送 ")
    private Integer proDelivery;

    /**
     * 套餐是否含有该项目
     */

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

@@ -169,10 +169,11 @@



    @Select("SELECT a.* FROM tj_order_remark a LEFT JOIN sys_dept b ON b.dept_id=a.dept_id LEFT JOIN tj_project c ON c.pro_id=a.pro_id\n" +
            "\n" +
            "WHERE a.deleted=0 AND b.org_type = 3 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
//    @Select("SELECT a.* FROM tj_order_remark a LEFT JOIN sys_dept b ON b.dept_id=a.dept_id LEFT JOIN tj_project c ON c.pro_id=a.pro_id\n" +
//            "\n" +
//            "WHERE a.deleted=0 AND b.org_type = 3 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")

    @Select("call notHuaYanData(#{tjnumber,mode=IN})")
    List<TjOrderRemark> notHuaYanData(String tjnumber);

    @Select("SELECT a.* FROM tj_order_remark a LEFT JOIN sys_dept b ON b.dept_id=a.dept_id LEFT JOIN tj_project c ON c.pro_id=a.pro_id\n" +

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

@@ -69,4 +69,9 @@
    @Select("call tj_new_advicerules(\n" +
            "                #{ks,mode=IN,jdbcType=VARCHAR},#{jg,mode=IN,jdbcType=VARCHAR},#{kslx,mode=IN,jdbcType=VARCHAR},#{xb,mode=IN,jdbcType=VARCHAR}  )")
    Map<String, Object> getyichangxiangmujianyiguizeJianCha(@Param("ks") String ks,@Param("jg") String s,@Param("kslx") String kslx,@Param("xb") String xb);



    @Select("SELECT a.ks FROM tj_pro_advicerules a WHERE a.deleted=0 GROUP BY a.ks")
    List<String> getTjProAdvicerulesKsList();
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProAdvicerulesService.java

@@ -62,4 +62,6 @@
    public int deleteTjProAdvicerulesById(Long id);

    Map<String, Object> getyichangxiangmujianyiguizeJianCha(String ks, String s, String kslx,String xb);

    List<String> getTjProAdvicerulesKsList();
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProAdvicerulesServiceImpl.java

@@ -95,4 +95,9 @@
    public Map<String, Object> getyichangxiangmujianyiguizeJianCha(String ks, String s, String kslx,String xb) {
        return tjProAdvicerulesMapper.getyichangxiangmujianyiguizeJianCha(ks,s,kslx,xb);
    }

    @Override
    public List<String> getTjProAdvicerulesKsList() {
        return tjProAdvicerulesMapper.getTjProAdvicerulesKsList();
    }
}