zjh20250627

zjh

7 天以前 0a469fa5898ac2b63b860d17ac10c0ebf534d82f

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

@@ -133,7 +133,7 @@
            String code1 = object1.getStr("ResultCode");
            if (code1.equals("0")) {
                JSONArray resultDatas = object1.getJSONArray("ResultData");
                if (null != resultDatas && resultDatas.size() > 0) {
                if (null != resultDatas && !resultDatas.isEmpty()) {
                    Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
                    String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
                    jzh=hisRegistrationId;
@@ -2530,11 +2530,11 @@
        String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
        String isRequestLisAllzx = configService.selectConfigByKey("jcx_is_requestLisAllzx");
        if (mergeRequest.equals("Y")){
            LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
            List<TjSampling> list = tjSamplingService.list(wrapper);
            if (isRequestLisAllzx != null && isRequestLisAllzx.equals("Y")){
                log.info("进入团体根据小项标本合并发送方法");
                LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
                wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
                List<TjSampling> list = tjSamplingService.list(wrapper);
                if(null !=list && !list.isEmpty()){
                    List<String> strings = list.stream().map(TjSampling::getProId).collect(Collectors.toList());
                    LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
@@ -2543,7 +2543,9 @@
                    wrapper1.groupBy(TjProject::getProId);
                    List<TjProject> tjProjectList = projectService.list(wrapper1);
                    if(null !=  tjProjectList && !tjProjectList.isEmpty()){
                        Map<String, List<TjProject>> listMap = tjProjectList.stream().collect(Collectors.groupingBy(TjProject::getSpecimenType));
                        Map<String, List<TjProject>> listMap = tjProjectList.stream()
                                .collect(Collectors.groupingBy(p->p.getSpecimenType()+"_"+p.getYb()));

                        log.info("分组后 ->{}",JSONUtil.toJsonStr(listMap));
                        boolean save = lisApiMethod.save(listMap, tjOrder, customer);
                        if (!save) {
@@ -2560,9 +2562,9 @@

            }else{
                try {
                    LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
                    wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
                    List<TjSampling> list = tjSamplingService.list(wrapper);
//                    LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
//                    wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
//                    List<TjSampling> list = tjSamplingService.list(wrapper);
                    log.info("采样数据 ->{}",JSONUtil.toJsonStr(list));
                    if (!list.isEmpty()) {
                        Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));