ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java

@@ -24,10 +24,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -128,24 +125,35 @@
                    String bldh = water.getJxbz();
//                    lisRevoke(water.getTjNumber(),bldh);
                    if (bldh != null){
                        remarkService.deleteTjOrderDetailByjxbz(bldh);
                        remarkService.updateTjOrderRemarkSfbzByJxbz(order.getOrderId().toString(),bldh,null);
/*                        remarkService.deleteTjOrderDetailByjxbz(bldh);
                        tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
                        tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
                        transitionService.deleteTjOrderDetailByjxbz(bldh);
                        blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, order.getTjNumber()).eq(TjProBl::getBldh, bldh));
                        tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(order.getTjNumber(), order.getUserId(),bldh);
                        tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(order.getTjNumber(), order.getUserId(),bldh);*/

                    }else {
                        tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
//                        TjCustomer customer = tjCustomerService.getById(order.getUserId());
//                        customer.setCardId("0");
//                        tjCustomerService.updateById(customer);

                       /* tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
                        tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
                        remarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
                        tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
                        transitionService.deletedTbTransitionByTjNum(order.getTjNumber());
                        ycxmService.delOrderYcXmJyByTjh(order.getTjNumber());
                        TjCustomer customer = tjCustomerService.getById(order.getUserId());
                        customer.setCardId("0");
                        tjCustomerService.updateById(customer);
                        tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());
                        tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());*/
//                        tjOrderService.removeById(order.getOrderId());

                        remarkService.updateTjOrderRemarkSfbzByJxbzisnull(order.getOrderId().toString(),null);
                    }
                    water.setPayStasus(2L);
                    water.setRefundPersonId("his回调");
                    water.setRefundTime(new Date());
                    water.setRefundPrice(water.getPaidIn());
                    tjFlowingWaterService.updateById(water);
                }
            }
        }

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

@@ -3276,7 +3276,7 @@
        TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
        if (null != order) {

            if (null != order.getFinishTime()) return AjaxResult.error("该人员已签离,不可撤销!!!");
            if (null != order.getPrintLastTime()) return AjaxResult.error("该人员报告已打印,不可撤销!!!");

            Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
            String username = SecurityUtils.getUsername();
@@ -3285,7 +3285,7 @@
            TjCustomer tjCustomer = tjCustomerService.getOne(wrapper);

            String s = configService.selectConfigByKey("is_request_common_his_api");
//            if (null != s && s.equals("Y") && "2".equals(order.getTjType())) {

            if (null != s && s.equals("Y") && !useLisAndPacsRegister) {
                String apiUrl = configService.selectConfigByKey("common_api_url");
                String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
@@ -3301,7 +3301,7 @@
                for (TjFlowingWater water : list) {
                    if (water.getPayStasus() == 0L) {
                        weizhifu.add(water);
                    } else {
                    } else if (water.getPayStasus() == 1L){
                        yizhifu.add(water);
                    }
                }
@@ -3309,27 +3309,22 @@
                log.info("工号为: "+username+" 的用户即将撤销 体检号为:"+tjNum+" 的体检记录;" );
                AjaxResult error = zuofeiWeiZhifu(weizhifu, tjCustomer, apiUrl, hospbm, order, true, tjNum);
                if (error != null && !error.get("code").toString().equals("200")){
                    log.info("工号为: "+username+" 的用户正在撤销 体检号为:"+tjNum+" 并且未支付的体检记录;" );
                    log.info("工号为: "+username+" 的用户正在撤销 体检号为:"+tjNum+" 并且未支付的体检记录;   撤销失败!!!!" );
                    return error;
                }else {
                    log.info("工号为: "+username+" 的用户正在撤销 体检号为:"+tjNum+" 并且未支付的体检记录;" );
                }
                AjaxResult error1 = zuofeiYiZhifu(yizhifu, tjCustomer, order, apiUrl, hospbm, false, tjNum);
                if (error1 != null && !error.get("code").toString().equals("200"))
                {
                    log.info("工号为: "+username+" 的用户正在撤销 体检号为:"+tjNum+" 并且已支付的体检记录;" );
                    log.info("工号为: "+username+" 的用户正在撤销 体检号为:"+tjNum+" 并且已支付的体检记录;   撤销失败!!!!" );
                    return error1;
                }else {
                    log.info("工号为: "+username+" 的用户正在撤销 体检号为:"+tjNum+" 并且已支付的体检记录;" );
                }
            } else {
                tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
                tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
                remarkService.deletedOrderRemarkByTjNum(tjNum);
                tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
                transitionService.deletedTbTransitionByTjNum(tjNum);
                ycxmService.delOrderYcXmJyByTjh(tjNum);
                tjCustomer.setCardId("0");
                tjCustomerService.updateById(tjCustomer);
                xdPictureService.deleteTjXdPictureBytjNum(tjNum);
                tjSamplingMapper.deleteByTjNumAndCusId(tjNum, order.getUserId());

            }


            String configByKey = configService.selectConfigByKey("sfkqdyhis");
            if (configByKey.equals("Y")) {
@@ -3359,8 +3354,21 @@
                }

            }

            tjCustomer.setCardId("0");
            tjCustomerService.updateById(tjCustomer);
                /*                tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
                tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
                remarkService.deletedOrderRemarkByTjNum(tjNum);
                tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
                transitionService.deletedTbTransitionByTjNum(tjNum);
                ycxmService.delOrderYcXmJyByTjh(tjNum);
                xdPictureService.deleteTjXdPictureBytjNum(tjNum);
                tjSamplingMapper.deleteByTjNumAndCusId(tjNum, order.getUserId());*/
            tjOrderService.removeById(order.getOrderId());
            return AjaxResult.success("撤销成功");
        }
        return AjaxResult.success("签到记录不存在!");
        return AjaxResult.error("签到记录不存在!");
    }


@@ -3558,6 +3566,7 @@

        TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
        if (null != order) {

            LambdaQueryWrapper<TjProBl> wq = new LambdaQueryWrapper<>();
            wq.eq(TjProBl::getTjh, tjNum);
            List<TjProBl> blList = blService.list(wq);
@@ -3598,6 +3607,8 @@
        TjOrder order = tjOrderService.getOrderByTjNum(dto.getTjh());
        String username = SecurityUtils.getUsername();
        if (null != order) {

            if (null != order.getPrintLastTime()) return AjaxResult.error("该人员报告已打印,不可撤销!!!");

            log.info("工号为: "+username+" 的用户即将撤销 体检号为:"+dto.getTjh()+"补录单号为: " + dto.getBldhs()+ " 的 补录体检记录;" );
            String configByKey = configService.selectConfigByKey("sfkqdyhis");
@@ -3651,7 +3662,7 @@
                    TjFlowingWater water = tjFlowingWaterService.getOne(wrapper);
                    if (water.getPayStasus() == 0L) {
                        weizhifu.add(water);
                    } else {
                    } else if (water.getPayStasus() == 1L){
                        yizhifu.add(water);
                    }
                }
@@ -3663,28 +3674,32 @@
                AjaxResult error = zuofeiWeiZhifu(weizhifu, tjCustomer, apiUrl, hospbm, order, true, dto.getTjh());
                if (error != null && !error.get("code").toString().equals("200"))
                {
                    log.info("工号为: "+username+" 的用户正在撤销 体检号为:"+dto.getTjh()+"补录单号为: " + dto.getBldhs()+ " 并且未支付的补录体检记录;" );
                    log.info("体检号为:"+dto.getTjh()+"补录单号为: " + dto.getBldhs()+ " 并且未支付的补录体检记录;  撤销失败" );
                    return error;
                }else {
                    log.info("工号为: "+username+" 的用户正在撤销 体检号为:"+dto.getTjh()+"补录单号为: " + dto.getBldhs()+ " 并且未支付的补录体检记录;" );
                }

                AjaxResult error1 = zuofeiYiZhifu(yizhifu, tjCustomer, order, apiUrl, hospbm, false, dto.getTjh());
                if (error1 != null && !error.get("code").toString().equals("200"))
                {
                    log.info("工号为: "+username+" 的用户正在撤销 体检号为:"+dto.getTjh()+"补录单号为: " + dto.getBldhs()+ " 并且已支付的补录体检记录;" );
                    log.info("体检号为:"+dto.getTjh()+"补录单号为: " + dto.getBldhs()+ " 并且已支付的补录体检记录;  撤销失败" );
                    return error1;
                }else {
                    log.info("工号为: "+username+" 的用户正在撤销 体检号为:"+dto.getTjh()+"补录单号为: " + dto.getBldhs()+ " 并且已支付的补录体检记录;" );
                }
                return AjaxResult.success();
            } else {
            }

                try {
                    extracted(dto, order);
                } catch (Exception e) {
                    log.info("撤销失败,删除表失败");
                    return AjaxResult.error("撤销失败,删除表失败!");
                }
                return AjaxResult.success();
            }
                return AjaxResult.success("撤销成功!");

        }
        return AjaxResult.error();
        return AjaxResult.error("未查询到体检记录!");
    }

    private AjaxResult zuofeiYiZhifu(ArrayList<TjFlowingWater> yizhifu, TjCustomer tjCustomer, TjOrder order, String apiUrl, String hospbm, Boolean isDelete, String tjNum) {
@@ -3757,7 +3772,7 @@
                        String tfid = jsonObject.getJSONObject("data").getStr("feiYongId");
                        water.setHisTfWaterId(tfid);
                        tjFlowingWaterService.updateById(water);
                        if (isDelete) {
           /*             if (isDelete) {
                            for (TjFlowingWater water1 : yizhifu) {
                                String bldh1 = water1.getJxbz();
                                remarkService.deleteTjOrderDetailByjxbz(bldh1);
@@ -3767,8 +3782,8 @@
                                blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, tjNum).eq(TjProBl::getBldh, bldh1));
                                tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(tjNum, order.getUserId(), bldh1);
                            }
                        }
                    } else return AjaxResult.error();
                        }*/
                    } else return AjaxResult.error("撤销失败");
                }
            }
        }
@@ -3785,7 +3800,7 @@

            String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/revokeCost", chexiaoMap);
            if (JSONUtil.parseObj(post).getStr("code").equals("200")) {
                if (isDelete) {
                /*if (isDelete) {
                    for (TjFlowingWater water : weizhifu) {
                        String bldh = water.getJxbz();
                        if (StrUtil.isNotBlank(bldh)) {
@@ -3797,31 +3812,39 @@
                            tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(tjNum, order.getUserId(), bldh);
                        } else {
                            //这里删除的是这个人所有项目包括补录项目
                            tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
                *//*            tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
                            tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
                            remarkService.deletedOrderRemarkByTjNum(tjNum);
                            tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
                            transitionService.deletedTbTransitionByTjNum(tjNum);
                            tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());
                            tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());*//*
//                            TjCustomer customer = tjCustomerService.getById(order.getUserId());
//                            customer.setCardId("0");
//                            tjCustomerService.updateById(customer);
//                            tjOrderService.removeById(order.getOrderId());
                        }

                    }
                }
            } else return AjaxResult.error();
                }*/
            } else return AjaxResult.error("撤销失败");
        }
        return null;
    }

    //    @Transactional(propagation =Propagation.REQUIRES_NEW)
    public void extracted(TjProBlDto dto, TjOrder order) {
        for (String bldh : dto.getBldhs()) {
            remarkService.deleteTjOrderDetailByjxbz(bldh);
            tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
            tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
            transitionService.deleteTjOrderDetailByjxbz(bldh);
            blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, dto.getTjh()).eq(TjProBl::getBldh, bldh));
        try {
            for (String bldh : dto.getBldhs()) {
                remarkService.deleteTjOrderDetailByjxbz(bldh);
                tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
                tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
                transitionService.deleteTjOrderDetailByjxbz(bldh);
                blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, dto.getTjh()).eq(TjProBl::getBldh, bldh));
            }
            tjSamplingMapper.deleteByTjNumAndCusIdAndJxbz(dto.getTjh(), order.getUserId(), dto.getBldhs());
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
        tjSamplingMapper.deleteByTjNumAndCusIdAndJxbz(dto.getTjh(), order.getUserId(), dto.getBldhs());
    }



 ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java

@@ -8,8 +8,10 @@
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.db.DataSourceConfig;
import com.ltkj.db.DataSourceContextHolder;
import com.ltkj.hosp.domain.DictCommonHisConfig;
import com.ltkj.hosp.domain.DictHosp;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.DictCommonHisConfigService;
import com.ltkj.hosp.service.IDictHospService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -43,6 +45,10 @@
@Api(tags = "PC端 积木报表接口集")
@Slf4j
public class JimuController {

    @Autowired
    private DictCommonHisConfigService dictCommonHisConfigService;

//    @Value("${jimu.path}")
    private static  String value;

@@ -135,8 +141,9 @@
    @GetMapping("/getBingZhong")
    public String getBingZhongInfo(@RequestParam("start") String start, @RequestParam("end") String end,@RequestParam(required = true,value = "hospId") String hospId){
        try {
            dataSourceConfig.addDataSource(hospId);
            DataSourceContextHolder.setDataSourceKey(hospId);
            DictCommonHisConfig hisConfig = dictCommonHisConfigService.getOne(new LambdaQueryWrapper<DictCommonHisConfig>().eq(DictCommonHisConfig::getHospital, hospId));
            dataSourceConfig.addDataSource(hisConfig.getDbName());
            DataSourceContextHolder.setDataSourceKey(hisConfig.getDbName());
            JSONObject object = JSONUtil.createObj();
            object.putOpt("data",testMapper.getBingZhongInfo(start,end));
            return JSONUtil.toJsonStr(object);

 ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java

@@ -52,7 +52,8 @@
                        "/system/role/execUpdateSql",
                        "/jmreport/**",
                        "/**/*.html", "/**/*.css", "/**/*.js","/swagger-ui.html",
                        "/swagger-resources/**", "/*/api-docs", "/webjars/**"
                        "/swagger-resources/**", "/*/api-docs", "/webjars/**",
                        "/report/jmreport/getBingZhong"
                });

        registry.addInterceptor(jimuInterceptor)

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

New file
@@ -0,0 +1,53 @@
package com.ltkj.hosp.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;

/**
 * @TableName dict_common_his_config
 */
@TableName(value ="dict_common_his_config")
@Data
public class DictCommonHisConfig implements Serializable {
    private Integer id;

    private String fullKey;

    private String province;

    private String region;

    private String city;

    private String hospital;

    private String tjUrl;

    private String hisApiUrl;

    private Integer hisApiPort;

    private String hisApiAppend;

    private String czy;

    private String czyId;

    private String kdks;

    private String dbIp;

    private Integer dbPort;

    private String dbName;

    private String dbUser;

    private String dbPassword;

    private static final long serialVersionUID = 1L;
}

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

New file
@@ -0,0 +1,18 @@
package com.ltkj.hosp.mapper;

import com.ltkj.hosp.domain.DictCommonHisConfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
* @author w
* @description 针对表【dict_common_his_config(公共组件服务HIS请求管理)】的数据库操作Mapper
* @createDate 2025-06-24 10:18:32
* @Entity com.ltkj.hosp.domain.DictCommonHisConfig
*/
public interface DictCommonHisConfigMapper extends BaseMapper<DictCommonHisConfig> {

}





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

New file
@@ -0,0 +1,13 @@
package com.ltkj.hosp.service;

import com.ltkj.hosp.domain.DictCommonHisConfig;
import com.baomidou.mybatisplus.extension.service.IService;

/**
* @author w
* @description 针对表【dict_common_his_config(公共组件服务HIS请求管理)】的数据库操作Service
* @createDate 2025-06-24 10:18:32
*/
public interface DictCommonHisConfigService extends IService<DictCommonHisConfig> {

}

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

New file
@@ -0,0 +1,22 @@
package com.ltkj.hosp.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.hosp.domain.DictCommonHisConfig;
import com.ltkj.hosp.service.DictCommonHisConfigService;
import com.ltkj.hosp.mapper.DictCommonHisConfigMapper;
import org.springframework.stereotype.Service;

/**
* @author w
* @description 针对表【dict_common_his_config(公共组件服务HIS请求管理)】的数据库操作Service实现
* @createDate 2025-06-24 10:18:32
*/
@Service
public class DictCommonHisConfigServiceImpl extends ServiceImpl<DictCommonHisConfigMapper, DictCommonHisConfig>
    implements DictCommonHisConfigService{

}





 ltkj-hosp/src/main/resources/mapper/DictCommonHisConfigMapper.xml

New file
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ltkj.hosp.mapper.DictCommonHisConfigMapper">

    <resultMap id="BaseResultMap" type="com.ltkj.hosp.domain.DictCommonHisConfig">
            <id property="id" column="id" jdbcType="INTEGER"/>
            <result property="fullKey" column="full_key" jdbcType="VARCHAR"/>
            <result property="province" column="province" jdbcType="VARCHAR"/>
            <result property="region" column="region" jdbcType="VARCHAR"/>
            <result property="city" column="city" jdbcType="VARCHAR"/>
            <result property="hospital" column="hospital" jdbcType="VARCHAR"/>
            <result property="tjUrl" column="tj_url" jdbcType="VARCHAR"/>
            <result property="hisApiUrl" column="his_api_url" jdbcType="VARCHAR"/>
            <result property="hisApiPort" column="his_api_port" jdbcType="SMALLINT"/>
            <result property="hisApiAppend" column="his_api_append" jdbcType="VARCHAR"/>
            <result property="czy" column="czy" jdbcType="VARCHAR"/>
            <result property="czyId" column="czy_id" jdbcType="VARCHAR"/>
            <result property="kdks" column="kdks" jdbcType="VARCHAR"/>
            <result property="dbIp" column="db_ip" jdbcType="VARCHAR"/>
            <result property="dbPort" column="db_port" jdbcType="SMALLINT"/>
            <result property="dbName" column="db_name" jdbcType="VARCHAR"/>
            <result property="dbUser" column="db_user" jdbcType="VARCHAR"/>
            <result property="dbPassword" column="db_password" jdbcType="VARCHAR"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,full_key,province,
        region,city,hospital,
        tj_url,his_api_url,his_api_port,
        his_api_append,czy,czy_id,
        kdks,db_ip,db_port,
        db_name,db_user,db_password
    </sql>
</mapper>