zjh 本地 2024/06/15 --2

zjh

2024-06-15 4dc5a1ece2a58f768dea5c829bff9da842a6de95

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

@@ -161,7 +161,7 @@
                            }else {
                                detailsDto.setSfzhfy("0");
                            }
                            detailsDto.setSl(1);
                            detailsDto.setSl(project.getSl());
                            detailsDtos.add(detailsDto);
                        }
                    }
@@ -254,7 +254,7 @@
                            }else {
                                detailsDto.setSfzhfy("0");
                            }
                            detailsDto.setSl(1);
                            detailsDto.setSl(project.getSl());
                            detailsDtoss.add(detailsDto);
                        }

@@ -338,6 +338,7 @@
            wq.in(TjProject::getProId, details.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
            wq.groupBy(TjProject::getHisXmbm);
            wq.in(TjProject::getDeptId, "100", "240", "253", "254", "255", "257", "258", "259", "269", "270");
            wq.isNull(TjProject::getDeptId);
            List<TjProject> projects = projectService.list(wq);
            if (null != projects && projects.size() > 0) {
                for (TjProject project : projects) {
@@ -350,7 +351,7 @@
                            } else {
                                detailsDto.setSfzhfy("0");
                            }
                            detailsDto.setSl(1);
                            detailsDto.setSl(project.getSl());
                            detailDtos.add(detailsDto);
                        }
                    }