代码提交

liusheng

2025-04-10 1967693c5d760ade002f8a5fbea10b51aef5693f

代码提交

 smartor/src/main/java/com/smartor/service/impl/HeLibraryAssortServiceImpl.java

@@ -61,9 +61,9 @@
        //遍历查出来的数据，通过 id=pid 获取他们的子数据
        List<HeLibraryAssortVO> heLibraryAssortVOArrayList = new ArrayList<>();
        for (HeLibraryAssortVO heLibraryAssortVO : heLibraryAssortVOS) {
            if (heLibraryAssortVO.getPid() != null) {
                continue;
            }
//            if (heLibraryAssortVO.getPid() != null) {
//                continue;
//            }
            HeLibraryAssort heLibraryAssort1 = new HeLibraryAssort();
            heLibraryAssort1.setPid(heLibraryAssortVO.getId());
            List<HeLibraryAssort> heLibraryAssortList = heLibraryAssortMapper.selectHeLibraryAssortList(heLibraryAssort1);

 smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java

@@ -179,14 +179,14 @@
    public List<IvrLibaScriptAssortVO> selectIvrLibaScriptAssortList(IvrLibaScriptAssort ivrLibaScriptAssort) {
        List<IvrLibaScriptAssort> ivrLibaScriptAssorts = ivrLibaScriptAssortMapper.selectIvrLibaScriptAssortList(ivrLibaScriptAssort);
        //将pid为空的，过滤掉
        ivrLibaScriptAssorts = ivrLibaScriptAssorts.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
//        ivrLibaScriptAssorts = ivrLibaScriptAssorts.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());

        List<IvrLibaScriptAssortVO> ivrLibaScriptAssortVOS = DtoConversionUtils.sourceToTarget(ivrLibaScriptAssorts, IvrLibaScriptAssortVO.class);
        //遍历查出来的数据，通过 id=pid 获取他们的子数据
        for (IvrLibaScriptAssortVO ivrLibaScriptAssortVO : ivrLibaScriptAssortVOS) {
            if (ivrLibaScriptAssortVO.getPid() != null) {
                continue;
            }
//            if (ivrLibaScriptAssortVO.getPid() != null) {
//                continue;
//            }
            IvrLibaScriptAssort ivrLibaTargetAssort1 = new IvrLibaScriptAssort();
            ivrLibaTargetAssort1.setPid(ivrLibaScriptAssortVO.getId());
            List<IvrLibaScriptAssort> ivrLibaScriptAssorts1 = ivrLibaScriptAssortMapper.selectIvrLibaScriptAssortList(ivrLibaTargetAssort1);

 smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java

@@ -52,18 +52,18 @@
        //将pid为空的，过滤掉
        List<IvrLibaTargetAssort> ivrLibaTargetAssortList = new ArrayList<>();
        for (IvrLibaTargetAssort ivrLibaTargetAssort1 : ivrLibaTargetAssorts) {
            if (ivrLibaTargetAssort1.getPid() != null) {
//            if (ivrLibaTargetAssort1.getPid() != null) {
                ivrLibaTargetAssortList.add(ivrLibaTargetAssort1);
            }
//            }
        }

        List<IvrLibaTargetAssortVO> ivrLibaTargetAssortVOS = DtoConversionUtils.sourceToTarget(ivrLibaTargetAssortList, IvrLibaTargetAssortVO.class);
        //遍历查出来的数据，通过 id=pid 获取他们的子数据
        List<IvrLibaTargetAssortVO> ivrLibaTargetAssortVOS1 = new ArrayList<>();
        for (IvrLibaTargetAssortVO ivrLibaTargetAssortVO : ivrLibaTargetAssortVOS) {
            if (ivrLibaTargetAssortVO.getPid() != -1) {
                continue;
            }
//            if (ivrLibaTargetAssortVO.getPid() != -1) {
//                continue;
//            }
            IvrLibaTargetAssort ivrLibaTargetAssort1 = new IvrLibaTargetAssort();
            ivrLibaTargetAssort1.setPid(ivrLibaTargetAssortVO.getId());
            List<IvrLibaTargetAssort> ivrLibaTargetAssorts2 = ivrLibaTargetAssortMapper.selectIvrLibaTargetAssortList(ivrLibaTargetAssort1);

 smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateAssortServiceImpl.java

@@ -50,14 +50,14 @@
    public List<IvrLibaTemplateAssortVO> selectIvrLibaTemplateAssortList(IvrLibaTemplateAssort ivrLibaScriptAssort) {
        List<IvrLibaTemplateAssort> ivrLibaTemplateAssorts = ivrLibaTemplateAssortMapper.selectIvrLibaTemplateAssortList(ivrLibaScriptAssort);
        //将pid为空的，过滤掉
        ivrLibaTemplateAssorts = ivrLibaTemplateAssorts.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
//        ivrLibaTemplateAssorts = ivrLibaTemplateAssorts.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());

        List<IvrLibaTemplateAssortVO> ivrLibaTemplateAssortVOS = DtoConversionUtils.sourceToTarget(ivrLibaTemplateAssorts, IvrLibaTemplateAssortVO.class);
        //遍历查出来的数据，通过 id=pid 获取他们的子数据
        for (IvrLibaTemplateAssortVO ivrLibaTemplateAssortVO : ivrLibaTemplateAssortVOS) {
            if (ivrLibaTemplateAssortVO.getPid() != null) {
                continue;
            }
//            if (ivrLibaTemplateAssortVO.getPid() != null) {
//                continue;
//            }
            IvrLibaTemplateAssort ivrLibaTemplateAssort = new IvrLibaTemplateAssort();
            ivrLibaTemplateAssort.setPid(ivrLibaTemplateAssortVO.getId());
            List<IvrLibaTemplateAssort> ivrLibaTemplateAssorts1 = ivrLibaTemplateAssortMapper.selectIvrLibaTemplateAssortList(ivrLibaTemplateAssort);

 smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java

@@ -586,6 +586,8 @@
                patMedOuthosp.setMainsuit(externalWZInfo.getNeiRong());
            }
        }
        patMedOuthosp.setCreateTime(new Date());
        patMedOuthosp.setUpdateTime(new Date());
        int i = patMedOuthospMapper.insertPatMedOuthosp(patMedOuthosp);
        if (i > 0) {
            return true;

 smartor/src/main/java/com/smartor/service/impl/SvyCategoryServiceImpl.java

@@ -52,14 +52,14 @@
    public List<SvyCategoryVO> selectSvyCategoryList(SvyCategory svyCategory) {
        List<SvyCategory> svyCategories = svyCategoryMapper.selectSvyCategoryList(svyCategory);
        //将pid为空的，过滤掉
        svyCategories = svyCategories.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
//        svyCategories = svyCategories.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());

        List<SvyCategoryVO> svyCategoryVOS = DtoConversionUtils.sourceToTarget(svyCategories, SvyCategoryVO.class);
        //遍历查出来的数据，通过 id=pid 获取他们的子数据
        for (SvyCategoryVO svyCategoryVO : svyCategoryVOS) {
            if (svyCategoryVO.getPid() != null) {
                continue;
            }
//            if (svyCategoryVO.getPid() != null) {
//                continue;
//            }
            SvyCategory svyCategory1 = new SvyCategory();
            svyCategory1.setPid(svyCategoryVO.getId());
            List<SvyCategory> svyCategoryList = svyCategoryMapper.selectSvyCategoryList(svyCategory1);

 smartor/src/main/java/com/smartor/service/impl/SvyLibScriptCategoryServiceImpl.java

@@ -52,15 +52,15 @@
    @Override
    public List<SvyLibScriptCategoryVO> selectSvyLibScriptCategoryList(SvyLibScriptCategory svyLibScriptCategory) {
        List<SvyLibScriptCategory> svyLibScriptCategories = svyLibScriptCategoryMapper.selectSvyLibScriptCategoryList(svyLibScriptCategory);
        //将pid为空的，过滤掉
        svyLibScriptCategories = svyLibScriptCategories.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
//        //将pid为空的，过滤掉
//        svyLibScriptCategories = svyLibScriptCategories.stream().filter(assort -> assort.getPid() != null).collect(Collectors.toList());

        List<SvyLibScriptCategoryVO> SvyLibScriptCategoryVO = DtoConversionUtils.sourceToTarget(svyLibScriptCategories, SvyLibScriptCategoryVO.class);
        //遍历查出来的数据，通过 id=pid 获取他们的子数据
        for (SvyLibScriptCategoryVO svyLibScriptCategoryVO : SvyLibScriptCategoryVO) {
            if (svyLibScriptCategoryVO.getPid() != null) {
                continue;
            }
//            if (svyLibScriptCategoryVO.getPid() != null) {
//                continue;
//            }
            SvyLibScriptCategory svyLibScriptCategory1 = new SvyLibScriptCategory();
            svyLibScriptCategory1.setPid(svyLibScriptCategoryVO.getId());
            List<SvyLibScriptCategory> svyLibScriptCategories1 = svyLibScriptCategoryMapper.selectSvyLibScriptCategoryList(svyLibScriptCategory1);

 smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateCategoryServiceImpl.java

@@ -50,14 +50,14 @@
    public List<SvyLibTemplateCategoryVO> selectSvyLibTemplateCategoryList(SvyLibTemplateCategory svyLibTemplateCategory) {
        List<SvyLibTemplateCategory> svyLibTemplateCategories = svyLibTemplateCategoryMapper.selectSvyLibTemplateCategoryList(svyLibTemplateCategory);
        //将pid为空的，过滤掉
        svyLibTemplateCategories = svyLibTemplateCategories.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
//        svyLibTemplateCategories = svyLibTemplateCategories.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());

        List<SvyLibTemplateCategoryVO> svyLibTemplateCategoryVOList = DtoConversionUtils.sourceToTarget(svyLibTemplateCategories, SvyLibTemplateCategoryVO.class);
        //遍历查出来的数据，通过 id=pid 获取他们的子数据
        for (SvyLibTemplateCategoryVO svyLibTemplateCategoryVO : svyLibTemplateCategoryVOList) {
            if (svyLibTemplateCategoryVO.getPid() != null) {
                continue;
            }
//            if (svyLibTemplateCategoryVO.getPid() != null) {
//                continue;
//            }
            SvyLibTemplateCategory svyLibTemplateCategory1 = new SvyLibTemplateCategory();
            svyLibTemplateCategory1.setPid(svyLibTemplateCategoryVO.getId());
            List<SvyLibTemplateCategory> svyLibTemplateCategoryList = svyLibTemplateCategoryMapper.selectSvyLibTemplateCategoryList(svyLibTemplateCategory1);

 smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml

@@ -109,7 +109,9 @@
            </if>
            <if test="deptname != null  and deptname != ''">and pmo.deptname like concat('%', #{deptname}, '%')</if>
            <if test="drname != null  and drname != ''">and pmo.drname like concat('%', #{drname}, '%')</if>
            <if test="patname != null  and patname != ''">and pmo.patname like concat('%', #{patname}, '%')</if>
            <if test="admitdate != null ">and pmo.admitdate = #{admitdate}</if>
            <if test="patid != null ">and pmo.patid = #{patid}</if>
            <if test="orgid != null  and orgid != ''">and pmo.orgid = #{orgid}</if>
            <if test="outhospno != null  and outhospno != ''">and pmo.outhospno = #{outhospno}</if>
        </where>