zjh 2024/07/22-1

zjh

2024-07-22 11c3eed72663870f1140616c631bb3ad1cab2838

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

@@ -204,6 +204,7 @@
                                detailsDto.setSfzhfy("0");
                            }
                            detailsDto.setSl(project.getSl());
                            detailsDto.setProjg(project.getProPrice());
                            detailsDtos.add(detailsDto);
                        }
                        if(project.getProId()==1740177341251154377L){
@@ -253,14 +254,24 @@
                    String mxfyxmbm = detail.getMxfyxmbm();
                    tree.setHisXmdm(mxfyxmbm);
                    tree.setType("检验");
                    LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
                    wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
                    List<TjProject> list = projectService.list(wrapper);
                    String tj_price = "";
                    for (TjProject project : list) {
                        tj_price += project.getProPrice() + "、";
                    }
                    tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
//                    LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
//                    wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
//                    List<TjProject> list = projectService.list(wrapper);
//                    String tj_price = "";
//                    for (TjProject project : list) {
//                        tj_price += project.getProPrice() + "、";
//                    }
//                    tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
//                    LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
//                    wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
//                    wrapper.eq(TjProject::getSl,1);
//                    wrapper.groupBy(TjProject::getHisXmbm);
//                    TjProject project = projectService.getOne(wrapper);
//                    if(null !=project){
//                        BigDecimal decimal = project.getProPrice().multiply(BigDecimal.valueOf(detail.getSl()));
//                        tree.setTjPrice(String.valueOf(decimal));
//                    }
                    tree.setTjPrice(String.valueOf(detail.getProjg()));
                    LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
                    if (detail.getSfzhfy().equals("1"))
                        wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
@@ -357,6 +368,7 @@
                                detailsDto.setSfzhfy("0");
                            }
                            detailsDto.setSl(project.getSl());
                            detailsDto.setProjg(project.getProPrice());
                            detailsDtoss.add(detailsDto);
                        }

@@ -382,14 +394,24 @@
                    String mxfyxmbm = detail.getMxfyxmbm();
                    tree.setHisXmdm(mxfyxmbm);
                    tree.setType("检查");
                    LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
                    wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
                    List<TjProject> list = projectService.list(wrapper);
                    String tj_price = "";
                    for (TjProject project : list) {
                        tj_price += project.getProPrice() + "、";
                    }
                    tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
//                    LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
//                    wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
//                    List<TjProject> list = projectService.list(wrapper);
//                    String tj_price = "";
//                    for (TjProject project : list) {
//                        tj_price += project.getProPrice() + "、";
//                    }
//                    tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
//                    LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
//                    wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
//                    wrapper.eq(TjProject::getSl,1);
//                    wrapper.groupBy(TjProject::getHisXmbm);
//                    TjProject project = projectService.getOne(wrapper);
//                    if(null !=project){
//                        BigDecimal decimal = project.getProPrice().multiply(BigDecimal.valueOf(detail.getSl()));
//                        tree.setTjPrice(String.valueOf(decimal));
//                    }
                    tree.setTjPrice(String.valueOf(detail.getProjg()));
                    LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
                    if (detail.getSfzhfy().equals("1"))
                        wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
@@ -453,6 +475,7 @@
                                detailsDto.setSfzhfy("0");
                            }
                            detailsDto.setSl(project.getSl());
                            detailsDto.setProjg(project.getProPrice());
                            detailDtos.add(detailsDto);
                        }
                    }
@@ -477,14 +500,16 @@
                    String mxfyxmbm = detail.getMxfyxmbm();
                    tree.setHisXmdm(mxfyxmbm);
                    tree.setType("处置");
                    LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
                    wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
                    List<TjProject> list = projectService.list(wrapper);
                    String tj_price = "";
                    for (TjProject project : list) {
                        tj_price += project.getProPrice() + "、";
                    }
                    tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
//                    LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
//                    wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
//                    wrapper.eq(TjProject::getSl,1);
//                    wrapper.groupBy(TjProject::getHisXmbm);
//                    TjProject project = projectService.getOne(wrapper);
//                    if(null !=project){
//                     BigDecimal decimal = project.getProPrice().multiply(BigDecimal.valueOf(detail.getSl()));
//                    tree.setTjPrice(String.valueOf(decimal));
//                    }
                    tree.setTjPrice(String.valueOf(detail.getProjg()));
                    LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
                    if (detail.getSfzhfy().equals("1"))
                        wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);