zjh20250226

zjh

2025-02-26 07e99128114a015c11fe21858f21f00306216472

zjh20250226

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

@@ -200,7 +200,7 @@
    }

//    Map<String,Object> mapJinchuan=new HashMap<>();
    List<String> mapJinchuan=null;
  private  static   List<String> mapJinchuan=null;
    public AjaxResult tijianshenqingJinchuanNew(TjCustomer customer, String date,String cardId)
    {
        mapJinchuan=new ArrayList<>();
@@ -213,6 +213,8 @@
        String dept = configService.selectConfigByKey("request_default_dept");
        String ysbm = configService.selectConfigByKey("request_default_ysbm");
        String ysmc = configService.selectConfigByKey("request_default_ysmc");

        log.info("mapJinchuan集合里面的数据是: "+mapJinchuan.toString());

        List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);

@@ -254,6 +256,8 @@
                            wrapper.notIn(TjProject::getProParentId, mapJinchuan);
                        }
                        List<TjProject> list = projectService.list(wrapper);

                        log.info("检验申请集合里面的数据是: "+list.toString());
                        for (TjProject tjProject : list) {
                            if (StrUtil.isNotBlank(tjProject.getHisXmbm()) && tjProject.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
                                OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();

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

@@ -560,7 +560,7 @@
                            maps.put("ksbm", "体检中心");
                            maps.put("pagecount", 100);
                            maps.put("page", 1);
//                    AjaxResult results = service.getHISDataNew("Getexamreportinfo", maps);


                            LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                            lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Getexamreportinfo");
@@ -568,7 +568,15 @@


                            /*同步检查 his存储过程*/
                            AjaxResult results = jcsqdService.getTjJcProByHisCall("体检中心", order.getCardId(), "''", 100, 1, "'1'");

                            String jctbfs = configService.selectConfigByKey("jctbfs");
                            AjaxResult results =null;
                            if (jctbfs.equalsIgnoreCase("Y")){
                                results = service.getHISDataNew("Getexamreportinfo", maps);
                            }else{
                                results = jcsqdService.getTjJcProByHisCall("体检中心", order.getCardId(), "''", 100, 1, "'1'");
                            }


                            DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
                            DynamicDataSourceContextHolder.clearDataSourceType();
@@ -803,7 +811,13 @@
                            lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Getexamreportinfo");
                            HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
                            /*同步检查 his存储过程*/
                            AjaxResult results = jcsqdService.getTjJcProByHisCall("体检中心", order.getCardId(), "''", 100, 1, "'1'");
                            String jctbfs = configService.selectConfigByKey("jctbfs");
                            AjaxResult results =null;
                            if (jctbfs.equalsIgnoreCase("Y")){
                                results = service.getHISDataNew("Getexamreportinfo", maps);
                            }else{
                                results = jcsqdService.getTjJcProByHisCall("体检中心", order.getCardId(), "''", 100, 1, "'1'");
                            }
                            DynamicDataSourceContextHolder.clearDataSourceType();
                            log.info("检查项目查询返回值:      " + results.toString());
                            if (Integer.parseInt(results.get("code").toString()) == 200) {

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

@@ -1212,16 +1212,16 @@
            /*调用his接口*/
            String config = configService.selectConfigByKey("sfkqdyhis");
            if (null != config && config.equals("Y")) {
                AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder);
                if (!result.get("code").toString().equals("200")) {
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    Object jzh = result.get("jzh");
                    if (null != jzh && null != jzh.toString()) {
                        hisApiMethod.ZfHisApiMethod(jzh.toString());
                    }
                    log.info("该登记人挂号失败, 就诊号为: " + tjOrder.getCardId());
                    return AjaxResult.error("挂号失败!" + result.get("msg").toString());
                }
//                AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder);
//                if (!result.get("code").toString().equals("200")) {
//                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
//                    Object jzh = result.get("jzh");
//                    if (null != jzh && null != jzh.toString()) {
//                        hisApiMethod.ZfHisApiMethod(jzh.toString());
//                    }
//                    log.info("该登记人挂号失败, 就诊号为: " + tjOrder.getCardId());
//                    return AjaxResult.error("挂号失败!" + result.get("msg").toString());
//                }

                log.info("该登记人的his就诊号是: " + tjOrder.getCardId());
                //团体
@@ -1239,8 +1239,8 @@
                    // 这是上面个人方法引入数据
                    tjFlowingWater.setPayStasus(1L);
                    newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
                    AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
                    if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
//                    AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
//                    if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
                    tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
                            sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
                    remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
@@ -3758,6 +3758,20 @@
    }


    @GetMapping("/chushenyemianyijianjiekou")
    @ApiOperation(value = "初审页面弃检接口")
    @Transactional
    public AjaxResult chushenyemianyijianjiekou(@RequestParam String tjNUm, @RequestParam String proId) {
        LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
        wq.eq(TjOrderRemark::getTjNumber, tjNUm);
        wq.eq(TjOrderRemark::getProId, proId);
        TjOrderRemark remark = remarkService.getOne(wq);
        remark.setType(1);
        remarkService.updateById(remark);
        return AjaxResult.success("操作成功!");
    }


    @PostMapping("/zongjanyemianshjianzhou")
    @ApiOperation(value = "总检获取时间轴接口")
    @Transactional