zjh 2024/07/25-1

zjh

2024-07-25 fc568216a671c79c9fdf8cd12b827898cae84b27

 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){
@@ -215,6 +216,20 @@
                            detilsDto.setDcjl("1");
                            detilsDto.setPj("60");
                            detilsDto.setJj("60");
                            detilsDto.setJldw("");
                            detilsDto.setTjbm("");
                            detilsDto.setPs("");
                            detilsDto.setPsbm("");
                            detilsDto.setYyts("");
                            detilsDto.setXtph("");
                            detilsDto.setScph("");
                            detilsDto.setYpxq("");
                            detilsDto.setCdbm("");
                            detilsDto.setKfdw("");
                            detilsDto.setYfdw("");
                            detilsDto.setYysm("");
                            detilsDto.setFzbl("1");
                            detilsDto.setZh("0");
                            outpinmedicapplyDetilsDtos.add(detilsDto);
                        }
                    }
@@ -239,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);
@@ -279,6 +304,8 @@
            dto1.setCzyksbm("0101");
            dto1.setCflxbm("A");
            dto1.setYfbm("1");
            dto1.setFyts("1");
            dto1.setMzzd("");
            dto1.setDetails(outpinmedicapplyDetilsDtos);
            AjaxResult result = controller.Outpinmedicapply(dto1);
            String result1 = getAjaxResult(result);
@@ -341,6 +368,7 @@
                                detailsDto.setSfzhfy("0");
                            }
                            detailsDto.setSl(project.getSl());
                            detailsDto.setProjg(project.getProPrice());
                            detailsDtoss.add(detailsDto);
                        }

@@ -366,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);
@@ -437,6 +475,7 @@
                                detailsDto.setSfzhfy("0");
                            }
                            detailsDto.setSl(project.getSl());
                            detailsDto.setProjg(project.getProPrice());
                            detailDtos.add(detailsDto);
                        }
                    }
@@ -461,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);