Merge branch 'master' into smartor_ls_261103

陈昶聿

8 天以前 2867cf7076a584a34e63174cec0a8b89cdd03e4c

 ruoyi-patarchive/src/main/java/com/ruoyi/patarchive/mapper/PatSpecificArchiveGenerateConfigMapper.java

@@ -2,6 +2,7 @@

import com.ruoyi.patarchive.domain.PatSpecificArchiveGenerateConfig;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@@ -18,6 +19,17 @@

    public List<PatSpecificArchiveGenerateConfig> selectPatSpecificArchiveGenerateConfigList(PatSpecificArchiveGenerateConfig patSpecificArchiveGenerateConfig);

    /**
     * 查询机构/院区可用的专科档案生成配置。
     * 机构配置优先；没有机构配置时才返回全局配置。
     *
     * @param orgid    机构ID
     * @param campusid 院区ID
     * @return 配置集合
     */
    public List<PatSpecificArchiveGenerateConfig> selectEffectivePatSpecificArchiveGenerateConfigList(@Param("orgid") String orgid,
                                                                                                       @Param("campusid") String campusid);

    public int insertPatSpecificArchiveGenerateConfig(PatSpecificArchiveGenerateConfig patSpecificArchiveGenerateConfig);

    public int updatePatSpecificArchiveGenerateConfig(PatSpecificArchiveGenerateConfig patSpecificArchiveGenerateConfig);