zhaowenxuan
2025-01-02 f78aea34f0cbdaba114723d6edadc3648669aa24
lis api服务
4个文件已修改
55 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
@@ -22,6 +22,7 @@
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.stream.Collectors;
@@ -55,6 +56,9 @@
    private ITjOrderService orderService;
    @Autowired
    private TjProjectMapper tjProjectMapper;
    @Autowired
    private ISysConfigService sysConfigService;
    /**
     * 收退费回调接口
     * @param params
@@ -106,7 +110,7 @@
                if (order != null){
                    // 退费
                    String bldh = water.getJxbz();
                    //TODO 是否发送作废申请
//                    lisRevoke(water.getTjNumber(),bldh);
                    if (bldh != null){
                        remarkService.deleteTjOrderDetailByjxbz(bldh);
                        tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
@@ -132,6 +136,45 @@
        return AjaxResult.success();
    }
    private void lisRevoke(String tjNum,String jxbz){
        LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(TjSampling::getTjNum,tjNum);
        if (StrUtil.isNotBlank(jxbz))
            wrapper.eq(TjSampling::getJxbz,jxbz);
        List<TjSampling> list = tjSamplingMapper.selectList(wrapper);
        List<TjSampling> isMergeList = list.stream().filter(i -> i.getIsMerge() == 1).collect(Collectors.toList());
        JSONArray array = JSONUtil.createArray();
        for (TjSampling sampling : isMergeList) {
            String[] proIds = sampling.getProId().split(",");
            for (String proId : proIds) {
                JSONObject object = JSONUtil.createObj();
                TjProject project = tjProjectMapper.selectById(proId);
                object.putOpt("txm",sampling.getJyxh());
                object.putOpt("sfxmid",project.getProId());
                object.putOpt("sfxmname",project.getProName());
                object.putOpt("primaryKey",proId);
                array.add(object);
            }
            list = list.stream().filter(i -> !i.getProId().equals(sampling.getProId())).collect(Collectors.toList());
        }
        for (TjSampling sampling : list) {
            String proId = sampling.getProId();
            JSONObject object = JSONUtil.createObj();
            TjProject project = tjProjectMapper.selectById(proId);
            object.putOpt("txm",sampling.getJyxh());
            object.putOpt("sfxmid",project.getProId());
            object.putOpt("sfxmname",project.getProName());
            object.putOpt("primaryKey",proId);
            array.add(object);
        }
        String apiUrl = sysConfigService.selectConfigByKey("common_api_url");
        String hospbm = sysConfigService.selectConfigByKey("common_api_service_hospbm");
        HashMap<String, Object> hashMap = new HashMap<>();
        hashMap.put("list",array);
        String post = HttpClientUtils.sendPost(apiUrl + "/api/lis/"+ hospbm +"/revoke", hashMap);
    }
    /**
     * 获取所有的His字典集合
     * @param params
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SamplingServiceApi.java
@@ -234,7 +234,6 @@
            entries.putOpt("sfxmid",project.getProId());
            entries.putOpt("sfxmname",project.getProName());
            // 取tb表
            QueryWrapper<TbTransition> wrapper = new QueryWrapper<>();
            wrapper
                    .select("sum(now_price) as now_price")
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -248,7 +248,8 @@
                }
                String s = configService.selectConfigByKey("is_request_common_his_api");
                if (null != s && s.equals("Y") && order.getTjType().equals("2")) {
//                if (null != s && s.equals("Y") && order.getTjType().equals("2")) {
                if (null != s && s.equals("Y")) {
                    String apiUrl = configService.selectConfigByKey("common_api_url");
                    String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
                    HashMap<String, Object> map = new HashMap<>();
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -3008,7 +3008,8 @@
            if (null != order.getFinishTime()) return AjaxResult.error("该人员已签离,不可撤销!!!");
            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") && "2".equals(order.getTjType())) {
            if (null != s && s.equals("Y")) {
                String apiUrl = configService.selectConfigByKey("common_api_url");
                String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
@@ -3357,7 +3358,8 @@
                }
            }
            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") && "2".equals(order.getTjType())) {
            if (null != s && s.equals("Y")) {
                ArrayList<TjFlowingWater> weizhifu = new ArrayList<>();
                ArrayList<TjFlowingWater> yizhifu = new ArrayList<>();
                for (String bldh : dto.getBldhs()) {