ltkj_peis.git - gitblit

parent: db8fbbe8 | 补丁 | 提交 | ignore whitespace

zjh20250507

zjh

2025-05-07 d43c59032ea6117b8c24faed3fb3c683174f5418

zjh20250507

4个文件已修改

	ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -2084,7 +2084,7 @@
                                        document1.add(ppp);
                                    }
                                }else {
                                    if (StrUtil.isNotBlank(value.get(0).getSj()) && StrUtil.isNotBlank(value.get(0).getProResult())) {
                                    if (StrUtil.isNotBlank(value.get(0).getSj()) || StrUtil.isNotBlank(value.get(0).getProResult())) {
                                        pp = PdfUtils.setParagraph(remarkFonts, "检查所见：");
                                        document1.add(pp);
                                        ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
@@ -2561,7 +2561,7 @@
//        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.notHuaYanData(tjNumber);
        for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
            printReport.put(tjOrderRemark, null);
            printReport.put(tjOrderRemark,null);
        }
        for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
            List<TjPdfVO> tjPdfVOS = new ArrayList<>();

 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java

@@ -626,10 +626,11 @@
                    TjOrderYcxm ycxm = ycxmService.getOne(wq);
                    if(null !=ycxm){
                        ycxm.setJcjg(detail.getProResult());
                        String replacedAll = detail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "").replaceAll("[（(][^）)]*[）)]", "")
                                .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆", "");
                        List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
                                ,"","",order.getTjNumber()
                                ,detail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "").replaceAll("[（(][^）)]*[）)]", "")
                                        .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆","")
                                ,replacedAll,"",order.getTjNumber()
                                ,replacedAll
                                ,detail.getProResult());

                        String[] split = detail.getProResult().split("。|,|，");

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

@@ -1798,12 +1798,12 @@
                                if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
                                    if (null != tjOrderDetail.getProId() && null != tjOrderDetail.getYcbz()) {
                                        if (!tjOrderDetail.getDeptId().equals("2")) {
                                            String replacedAll = tjOrderDetail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "").replaceAll("[（(][^）)]*[）)]", "")
                                                    .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆", "");
                                            List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
                                                    , tjOrderDetail.getProName().replaceAll("[（(][^）)]*[）)]", "").replaceAll("◆","")
                                                            .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", ""),
                                                    , replacedAll,
                                                    tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
                                                    , tjOrderDetail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "").replaceAll("[（(][^）)]*[）)]", "")
                                                            .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆","")
                                                    ,replacedAll
                                                    , tjOrderDetail.getProResult());


@@ -1887,12 +1887,14 @@
                                    if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
                                        if (null != tjOrderDetail.getProId() && null != tjOrderDetail.getYcbz()) {
                                            if (!tjOrderDetail.getDeptId().equals("2")) {

                                                String replacedAll = tjOrderDetail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "").replaceAll("[（(][^）)]*[）)]", "")
                                                        .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆", "");

                                                List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
                                                        , tjOrderDetail.getProName().replaceAll("[（(][^）)]*[）)]", "").replaceAll("◆","")
                                                                .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", ""),
                                                        ,replacedAll,
                                                        tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
                                                        , tjOrderDetail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "")
                                                                .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆","")
                                                        , replacedAll
                                                        , tjOrderDetail.getProResult());



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

@@ -172,15 +172,17 @@



    @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" +
            "\n" +
            "WHERE a.deleted=0 AND  b.org_type = 2 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
//    AND c.need_report='Y' guo
    //    @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 = 2 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
    @Select("call pacsJianChaData(#{tjnumber,mode=IN})")
    List<TjOrderRemark> pacsJianChaData(String tjnumber);

			@@ -2084,7 +2084,7 @@
			document1.add(ppp);
			}
			}else {
			if (StrUtil.isNotBlank(value.get(0).getSj()) && StrUtil.isNotBlank(value.get(0).getProResult())) {
			if (StrUtil.isNotBlank(value.get(0).getSj()) \|\| StrUtil.isNotBlank(value.get(0).getProResult())) {
			pp = PdfUtils.setParagraph(remarkFonts, "检查所见：");
			document1.add(pp);
			ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
			@@ -2561,7 +2561,7 @@
			// List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
			List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.notHuaYanData(tjNumber);
			for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
			printReport.put(tjOrderRemark, null);
			printReport.put(tjOrderRemark,null);
			}
			for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
			List<TjPdfVO> tjPdfVOS = new ArrayList<>();

			@@ -626,10 +626,11 @@
			TjOrderYcxm ycxm = ycxmService.getOne(wq);
			if(null !=ycxm){
			ycxm.setJcjg(detail.getProResult());
			String replacedAll = detail.getProName().replaceAll("[（(][^）)][\u4e00-\u9fa5]+[^）)][）)]", "").replaceAll("[（(][^）)]*[）)]", "")
			.replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆", "");
			List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
			,"","",order.getTjNumber()
			,detail.getProName().replaceAll("[（(][^）)][\u4e00-\u9fa5]+[^）)][）)]", "").replaceAll("[（(][^）)]*[）)]", "")
			.replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆","")
			,replacedAll,"",order.getTjNumber()
			,replacedAll
			,detail.getProResult());

			String[] split = detail.getProResult().split("。\|,\|，");

			@@ -1798,12 +1798,12 @@
			if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
			if (null != tjOrderDetail.getProId() && null != tjOrderDetail.getYcbz()) {
			if (!tjOrderDetail.getDeptId().equals("2")) {
			String replacedAll = tjOrderDetail.getProName().replaceAll("[（(][^）)][\u4e00-\u9fa5]+[^）)][）)]", "").replaceAll("[（(][^）)]*[）)]", "")
			.replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆", "");
			List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
			, tjOrderDetail.getProName().replaceAll("[（(][^）)]*[）)]", "").replaceAll("◆","")
			.replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", ""),
			, replacedAll,
			tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
			, tjOrderDetail.getProName().replaceAll("[（(][^）)][\u4e00-\u9fa5]+[^）)][）)]", "").replaceAll("[（(][^）)]*[）)]", "")
			.replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆","")
			,replacedAll
			, tjOrderDetail.getProResult());


			@@ -1887,12 +1887,14 @@
			if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
			if (null != tjOrderDetail.getProId() && null != tjOrderDetail.getYcbz()) {
			if (!tjOrderDetail.getDeptId().equals("2")) {

			String replacedAll = tjOrderDetail.getProName().replaceAll("[（(][^）)][\u4e00-\u9fa5]+[^）)][）)]", "").replaceAll("[（(][^）)]*[）)]", "")
			.replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆", "");

			List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
			, tjOrderDetail.getProName().replaceAll("[（(][^）)]*[）)]", "").replaceAll("◆","")
			.replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", ""),
			,replacedAll,
			tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
			, tjOrderDetail.getProName().replaceAll("[（(][^）)][\u4e00-\u9fa5]+[^）)][）)]", "")
			.replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆","")
			, replacedAll
			, tjOrderDetail.getProResult());

			@@ -172,15 +172,17 @@



			@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" +
			"\n" +
			"WHERE a.deleted=0 AND b.org_type = 2 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
			// AND c.need_report='Y' guo
			// @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 = 2 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
			@Select("call pacsJianChaData(#{tjnumber,mode=IN})")
			List<TjOrderRemark> pacsJianChaData(String tjnumber);