zjh20250422

zjh

2025-04-22 22efacd7994f8ea9a7ef8485575ade9729a0e5a2

zjh20250422

 ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java

@@ -148,7 +148,7 @@
                                    if(null !=list && !list.isEmpty()){
                                        for (LtkjExamJcsqd jcsqd : list) {
                                            if(StringUtil.isNotBlank(jcsqd.getJgzt())){
                                                String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|；|;");
                                                String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|；|;|,|，");
                                                for (String jg : split) {
                                                    if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                                                            && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")

 ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java

@@ -22,6 +22,7 @@
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.web.controller.his.HisApiGetMethodService;
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -167,7 +168,7 @@
    }

    private int getAllTotal(TjOrder tjOrder, TjCustomer tjCustomer, JSONArray array, ArrayList<SavePacsApply> successPacsList, ArrayList<SavePacsApply> errorPacsList, TjProject project, String dept, String ysbm, String ysmc, int allTotal) {
        if (null != project.getHisXmbm()) {
        if (StringUtil.isNotBlank(project.getHisXmbm())) {
            SavePacsApply savePacsApply = new SavePacsApply();
            savePacsApply.setExamNo(tjOrder.getCardId());
            savePacsApply.setName(tjCustomer.getCusName());

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

@@ -629,7 +629,7 @@
                        List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
                                ,"","",order.getTjNumber()
                                ,detail.getProName().replaceAll("[（(][^）)]*[）)]", "")
                                        .replaceAll("[ 测定检测]","")
                                        .replaceAll("[ 测定检测]","").replaceAll("◆","")
                                ,detail.getProResult());

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

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

@@ -285,7 +285,7 @@
                if(!jcsqdList.isEmpty()){
                    for (LtkjExamJcsqd jcsqd : jcsqdList) {
                        if(StringUtil.isNotBlank(jcsqd.getJgzt())){
                            String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|；|;");
                            String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|；|;|,|，");
                            for (String jg : split) {
                                if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                                        && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")
@@ -323,7 +323,7 @@
    public AjaxResult zx(@RequestParam int day) {
        try {
            List<DictHosp> list = dictHospService.list();
            DateTime dateTime1 = DateUtil.offsetMonth(new Date(), day);
            DateTime dateTime1 = DateUtil.offsetDay(new Date(), day);
            for (DictHosp dictHosp : list) {
                String mallMerchantSecretKey = SecurityUtils.getMallMerchantSecretKey(secret, dictHosp.getHospAreaId(), dictHosp.getHospAreaName(), dateTime1);
                dictHosp.setSecretKey(mallMerchantSecretKey);

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

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


@@ -1797,7 +1798,7 @@
                                            }

                                        } else {
                                            String[] split = tjOrderDetail.getProResult().split("。|,|，");
                                            String[] split = tjOrderDetail.getProResult().split("。|；|;|,|，");
                                            List<Map<String, Object>> mapList = new ArrayList<>();
                                            for (String s : split) {
                                                s = s.replaceAll("\n", "");
@@ -1874,10 +1875,11 @@
                                        if (null != tjOrderDetail.getProId() && null != tjOrderDetail.getYcbz()) {
                                            if (!tjOrderDetail.getDeptId().equals("2")) {
                                                List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
                                                        , tjOrderDetail.getProName().replaceAll("[（(][^）)]*[）)]", "")
                                                                .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", ""), tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
                                                        , tjOrderDetail.getProName().replaceAll("[（(][^）)]*[）)]", "").replaceAll("◆","")
                                                                .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", ""),
                                                        tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
                                                        , tjOrderDetail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "")
                                                                .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "")
                                                                .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆","")
                                                        , tjOrderDetail.getProResult());



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

@@ -844,17 +844,7 @@
    }


    /**
     * 导出体检记录列表
     */
    @Log(title = "体检记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    @ApiOperation(value = "导出体检记录列表")
    public void export(HttpServletResponse response, TjOrder tjOrder) {
        List<TjOrder> list = tjOrderService.selectExportOrderList(tjOrder);
        ExcelUtil<TjOrder> util = new ExcelUtil<TjOrder>(TjOrder.class);
        util.exportExcel(response, list, "体检记录数据");
    }


    @PostMapping("/exportOrderList")
    @ApiOperation(value = "导出体检记录列表")
@@ -869,6 +859,7 @@
                                   @ApiParam(value = "报告开始时间") @RequestParam(required = false) Date bgbeginTime,
                                   @ApiParam(value = "报告结束时间") @RequestParam(required = false) Date bgendTime,
                                   @ApiParam(value = "单位") @RequestParam(required = false) String dw,
                                   @ApiParam(value = "当前页或全部数据") @RequestParam(required = false) String dqyorqbsj,
                                   HttpServletResponse response) {
        List<Long> cusIds = null;
        if (null != name) {
@@ -992,9 +983,15 @@
        }

        wq.orderByDesc(TjOrder::getCreateTime);
        Page<TjOrder> page2 = tjOrderService.page(page1, wq);
        List<TjOrder> list = page2.getRecords();
        if (list != null) {

        List<TjOrder> list =null;
        if(StringUtil.isNotBlank(dqyorqbsj) && dqyorqbsj.equals("1")){
            list = tjOrderService.list(wq);
        }else {
            Page<TjOrder> page2 = tjOrderService.page(page1, wq);
            list = page2.getRecords();
        }
        if (!list.isEmpty()) {
            for (TjOrder order : list) {
                TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
                if (null != tjCustomer) {
@@ -4093,16 +4090,6 @@
    @GetMapping(value = "newgetTransitionList")
    @ApiOperation(value = "最新查询过渡表数据")
    public AjaxResult newgetTransitionList(@RequestParam @ApiParam(value = "客户id") String cusId) {
//        String pacId = transitionService.getTbTransitionPacId(cusId);
//        if(StringUtil.isNotBlank(pacId)){
//            //补差价
//            List<Map<String,Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId, cusId);
//            if(null !=cjMaps && !cjMaps.isEmpty()){
//                for (Map<String, Object> cjMap : cjMaps) {
//                    transitionService.buxiangmuchajia(cusId,pacId,cjMap.get("xmid").toString(),new BigDecimal(cjMap.get("cj").toString()));
//                }
//            }
//        }
        List<TbTransition> list = transitionService.newgetTransitionList(cusId);
        return AjaxResult.success(list);
    }

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

@@ -16,6 +16,7 @@
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
import com.ltkj.hosp.vodomain.CsProVo;
import com.ltkj.system.service.ISysConfigService;
import io.swagger.annotations.Api;
@@ -68,6 +69,8 @@
    private LtkjExamJcbgdService jcbgdService;
    @Resource
    private LtkjExamJcsqdService jcsqdService;
    @Autowired
    private TjJcycxmService jcycxmService;
    /**
     * 查询体检心电图管理列表
     */
@@ -366,6 +369,7 @@
            }
            return AjaxResult.error("暂无体检记录");
        } catch (Exception e) {
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            log.error("提交影像检查骨密度心电图结果接口"+e.getMessage());
            throw new RuntimeException("提交影像检查骨密度心电图结果接口");
@@ -397,9 +401,34 @@
            jcbgd.setLx("1");
            jcbgd.setCreateTime(date);
            jcbgdService.save(jcbgd);
            jcsqdService.deletedLtkjJcsqdByTjhandtmh(xdtgmdjg.getCardId());
            jcsqdService.deletedLtkjJcsqdByTjhandtmh1(xdtgmdjg.getCardId());
            jcsqdService.saveLtkjExamJcsqdxdt(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("。|；|;|,|，");
                        for (String jg : split) {
                            if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                                    && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")
                                    && !jg.contains("未见明显")&& !jg.contains("正常")&& !jg.contains("双侧椎间孔无狭窄")){
                                TjJcycxm jcycxm=new TjJcycxm();
                                jcycxm.setTjh(xdtgmdjg.getTjh());
                                jcycxm.setYqid("");
                                jcycxm.setProId(xdtgmdjg.getProId());
                                jcycxm.setProName(xdtgmdjg.getProName());
                                jcycxm.setCreateTime(new Date());
                                jcycxm.setJcjg(jg);
                                jcycxmService.save(jcycxm);
                            }
                        }
                    }


        } catch (Exception e) {
            e.printStackTrace();
            throw new RuntimeException(e);
        }
    }

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

@@ -120,7 +120,7 @@
    private String firmId;

    @ApiModelProperty(value = "单位名称")
    @Excel(name = "单位名")
    @Excel(name = "单位")
    private String firmName;


@@ -128,8 +128,8 @@
    /**
     * 部门名
     */
    @Excel(name = "部门名", defaultValue = "无")
    @ApiModelProperty(value = "部门名")
    @Excel(name = "部门", defaultValue = "无")
    @ApiModelProperty(value = "部门")
    private String firmDeptName;

    /**
@@ -207,7 +207,7 @@
     * 报告最后打印时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = " 打印报告时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "无")
    @Excel(name = " 打印时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "无")
    @ApiModelProperty(value = "报告最后打印时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date printLastTime;
@@ -275,7 +275,7 @@
     */
    @TableField(exist = false)
    @ApiModelProperty(value = "体检记录中的客户身份证号码")
    @Excel(name = "身份证号码")
    @Excel(name = "证件号")
    private String tjCusIdCard;


@@ -379,7 +379,7 @@
    /**
     * 体检状态
     */
    @Excel(name = "体检状态", defaultValue = "无")
//    @Excel(name = "体检状态", defaultValue = "无")
    @ApiModelProperty(value = "体检状态")
    private Integer status;
    /**
@@ -445,7 +445,7 @@
     * 体检类别
     */
    @ApiModelProperty("体检类别")
    @Excel(name = "体检类别")
//    @Excel(name = "体检类别")
    private String tjCategory;

    @ApiModelProperty("就诊编号")

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

@@ -268,6 +268,9 @@
    @ApiModelProperty(value = "序号")
    private Integer xh;

    @ApiModelProperty(value = "是否参与异常")
    private Integer sfcyyc;

    /**
     * 子项目
     */

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

@@ -32,7 +32,7 @@
    void  deletedLtkjJcsqdByTjhandtmh(@Param("tjh") String tjh,@Param("tmh") String tmh);

    @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and lx=1 ")
    void  deletedLtkjJcsqdByTjhandtmh(@Param("tjh") String tjh);
    void  deletedLtkjJcsqdByTjhandtmh1(@Param("tjh") String tjh);

    @Select("SELECT * FROM ltkj_exam_jcsqd a WHERE a.tjh=#{tjh}")
    List<LtkjExamJcsqd> getLtkjJcsqdByTjh(String tjh);

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

@@ -25,7 +25,7 @@

    void  deletedLtkjJcsqdByTjhandtmh(String tjh,String tmh);

    void  deletedLtkjJcsqdByTjhandtmh(String tjh);
    void  deletedLtkjJcsqdByTjhandtmh1(String tjh);

    List<LtkjExamJcsqd> getLtkjJcsqdByTjh(String tjh);


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

@@ -62,8 +62,8 @@
    }

    @Override
    public void deletedLtkjJcsqdByTjhandtmh(String tjh) {
        mapper.deletedLtkjJcsqdByTjhandtmh(tjh);
    public void deletedLtkjJcsqdByTjhandtmh1(String tjh) {
        mapper.deletedLtkjJcsqdByTjhandtmh1(tjh);
    }

    @Override