zjh20250509

zjh

8 天以前 6341f129682926b3909604e9b04dc95199c2059a

zjh20250509

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

@@ -2074,26 +2074,36 @@
                            if (isPacs) {
                                Paragraph pp;
                                Paragraph ppp;
                                String key = sysConfigService.selectConfigByKey("makepdfuseorderdetailproresult");
                                if (StrUtil.isNotBlank(key) && !key.equals("Y")){
                                    if (StrUtil.isNotBlank(value.get(0).getSj())) {
                                        pp = PdfUtils.setParagraph(remarkFonts, "检查所见：");
                                        document1.add(pp);
                                        ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
                                        paragraph.setAlignment(Element.ALIGN_LEFT);
                                        paragraph.setLeading(5f);
                                        document1.add(ppp);
                                    }
                                }else {
                                    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);
                                        paragraph.setAlignment(Element.ALIGN_LEFT);
                                        paragraph.setLeading(5f);
                                        document1.add(ppp);
                                    }
//                                String key = sysConfigService.selectConfigByKey("makepdfuseorderdetailproresult");
//                                if (StrUtil.isNotBlank(key) && !key.equals("Y")){
//                                    if (StrUtil.isNotBlank(value.get(0).getSj())) {
//                                        pp = PdfUtils.setParagraph(remarkFonts, "检查所见：");
//                                        document1.add(pp);
//                                        ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
//                                        paragraph.setAlignment(Element.ALIGN_LEFT);
//                                        paragraph.setLeading(5f);
//                                        document1.add(ppp);
//                                    }
//                                }else {
//                                    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);
//                                        paragraph.setAlignment(Element.ALIGN_LEFT);
//                                        paragraph.setLeading(5f);
//                                        document1.add(ppp);
//                                    }
//                                }

                                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);
                                    paragraph.setAlignment(Element.ALIGN_LEFT);
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
                                }

                                pp = PdfUtils.setParagraph(remarkFonts, "检查提示：");
                                document1.add(pp);
                                ppp = new Paragraph((value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult()), remarkFonts);

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

@@ -15,6 +15,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
@@ -1373,6 +1374,23 @@
            /*调用his接口*/
            String config = configService.selectConfigByKey("sfkqdyhis");
            if (null != config && config.equals("Y")) {
                if(tjCustomer.getPationId().equals("0")){
                    AjaxResult result = controller.Outpincreateapply(tjCustomer);
                    String result1 = getAjaxResult(result);
                    JSONObject object = getJSONObject(result1);
                    String code = object.getStr("ResultCode");
                    if (code.equals("0")) {
                        JSONArray resultDatass = object.getJSONArray("ResultData");
                        Map<String, Object> resultData = (Map<String, Object>) resultDatass.get(0);
                        if (null != resultData && !resultData.isEmpty()) {
                            String pationid = resultData.get("PationId").toString();
                            if (null != pationid) {
                                tjCustomer.setPationId(pationid);
                                tjCustomerService.updateById(tjCustomer);
                            }
                        }
                    }
                }
                AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder);
                if (!result.get("code").toString().equals("200")) {
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

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

@@ -433,14 +433,13 @@
            jcbgdService.save(jcbgd);
            jcsqdService.saveXdtLtkjExamJcsqd(xdtgmdjg.getCardId(),jcbgd.getTmh());

            jcsqdService.deletedLtkjJcsqdByTjhandtmh1(xdtgmdjg.getCardId());

            LambdaQueryWrapper<TjJcycxm> wq=new LambdaQueryWrapper<>();
            wq.eq(TjJcycxm::getTjh,xdtgmdjg.getTjh());
            wq.eq(TjJcycxm::getProId,xdtgmdjg.getProId());
            jcycxmService.remove(wq);
            if(StringUtil.isNotBlank(xdtgmdjg.getJcjl())){
                String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "").split("。|；|;|,|，");
                String s = "。|；|;|,|，";
                String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "").split(s);
                for (String jg : split) {
                    if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                            && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")