去除建议性别查询条件

zhaowenxuan

2025-03-05 070d83ee5ef6e7bae0e36dc422fbfd04b8175b82

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

@@ -1700,6 +1700,9 @@
                    .filter(b -> maps.stream()
                            .noneMatch(a -> a.get("proName").equals(b.get("proName"))))  // 过滤掉在 maps 中存在的相同元素
                    .collect(Collectors.toList());



            if(!collect.isEmpty()){
                maps.addAll(collect);
            }
@@ -1748,13 +1751,17 @@
                            if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
                                if(!tjOrderDetail.getDeptId().equals("2")){
                                    List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
                                            ,"",tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber
                                            ,tjOrderDetail.getProName().replaceAll("[（(][^）)]*[）)]", "")
                                                    .replaceAll("[ 测定检测]","")
                                                    .replaceAll("[ 测定检测]","").replaceAll("\\[.*?\\]", ""),tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber
                                            ,tjOrderDetail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "")
                                                    .replaceAll("[ 测定检测]","").replaceAll("\\[.*?\\]", "")
                                            ,tjOrderDetail.getProResult());


                                    if(null !=maps && !maps.isEmpty()){
                                        tjOrderDetail.setAdvices(maps);
                                    }

                                }else {
                                    String[] split = tjOrderDetail.getProResult().split("。|,|，");
                                    List<Map<String,Object>> mapList=new ArrayList<>();
@@ -1811,11 +1818,16 @@
            String tjh = ycxms.get(0).getTjh();
            if(StringUtils.isNotBlank(tjh)){
                ycxmService.delOrderYcXmJyByTjh(tjh);

//                String szyssy="";
//                StringBuilder builders = new StringBuilder();
//                List<TjOrderYcxm> ycxmList=new ArrayList<>();
                for (TjOrderYcxm ycxm : ycxms) {
                    ycxm.setJynr(JSONUtil.toJsonStr(ycxm.getMap()));
//                     if(ycxm.getJcxm().contains("舒张压")||ycxm.getJcxm().contains("收缩压")){
//                        builders.append(ycxm.getJcxm()).append(ycxm.getJcjg()).append(" ");
//                        szyssy+=builders.toString();
//                    }
                }
//                List<TjOrderYcxm> collect = ycxms.stream().distinct().collect(Collectors.toList());
                ycxmService.saveBatch(ycxms);
                return AjaxResult.success();
            }