zjh20250226

zjh

2025-02-26 263413a9ade62a8501acbbc60157d48ca51a9f9d

 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();
@@ -677,7 +681,7 @@

                        if (null != project.getHisXmbm()) {
                            if (project.getSfzhfy().equals("Y")) {
                                mapJinchuan.add(project.getProParentId().toString());
                                mapJinchuan.add(project.getProId().toString());
                                //TODO 这里detailsDto 改成传递所有的小项 检验是合并之后进行发送 一个样本代码一次请求
                                // 所有的小项全部添加到这个集合之中
                                OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();