liusheng
2024-07-29 75cb81f0b88f313857ea431b46b929bef95d7cc8
代码提交
已修改8个文件
93 ■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/IPatArchiveService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
@@ -189,4 +189,21 @@
        util.exportExcel(response, patArchives, "患者档案数据");
    }
    /**
     * 获取患者信息
     */
    @ApiOperation("获取患者信息")
    @PostMapping("/getPatientInfo")
    public TableDataInfo getPatientInfo(@RequestBody PatArchiveReq patArchiveReq) {
        PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize());
        List<PatTaskRelevance> patientInfo = patArchiveService.getPatientInfo(patArchiveReq);
        long count = PageUtils.count(new ISelect() {
            @Override
            public void doSelect() {
                patArchiveService.getPatientInfo(patArchiveReq);
            }
        });
        return getDataTable2(count, patientInfo);
    }
}
smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java
@@ -174,6 +174,9 @@
    @ApiModelProperty(value = "附件信息")
    private String appenddesc;
    @ApiModelProperty(value = "附件信息")
    private String picturePath;
    /**
     * pageNum
     */
smartor/src/main/java/com/smartor/service/IPatArchiveService.java
@@ -90,4 +90,6 @@
    public List<PatArchivetagAndPatientInfo> patInfoByTag(List<Long> tagids);
    public List<Object> getUserTreatmentInfo(String pid,String type);
    public List<PatTaskRelevance> getPatientInfo(PatArchiveReq patArchiveReq);
}
smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
@@ -173,6 +173,48 @@
        return patArchiveMapper.deletePatArchiveByPatid(patid);
    }
    /**
     * 获取患者信息
     *
     * @param patArchiveReq
     * @return
     */
    @Override
    public List<PatTaskRelevance> getPatientInfo(PatArchiveReq patArchiveReq) {
        List<PatTaskRelevance> PatTaskRelevances = new ArrayList<>();
        List<PatArchive> patArchiveList = new ArrayList<>();
        if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 1) {
            //  查看住院  1  查看门诊  2   查看体检  3
            List<PatArchive> patArchives1 = patArchiveMapper.selectPatArchiveInfoByInhosp(patArchiveReq);
            if (CollectionUtils.isNotEmpty(patArchives1)) {
                patArchiveList.addAll(patArchives1);
            }
        } else if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 2) {
            // 查看住院  1  查看门诊  2   查看体检  3
            List<PatArchive> patArchives2 = patArchiveMapper.selectPatArchiveInfoByOuthosp(patArchiveReq);
            if (CollectionUtils.isNotEmpty(patArchives2)) {
                patArchiveList.addAll(patArchives2);
            }
        } else if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 3) {
            //  查看住院  1  查看门诊  2   查看体检  3
            List<PatArchive> patArchives3 = patArchiveMapper.selectPatArchiveInfoByPhysical(patArchiveReq);
            if (CollectionUtils.isNotEmpty(patArchives3)) {
                patArchiveList.addAll(patArchives3);
            }
        }
        for (PatArchive patArchive : patArchiveList) {
            PatTaskRelevance patTaskRelevance = DtoConversionUtils.sourceToTarget(patArchive, PatTaskRelevance.class);
            patTaskRelevance.setCreateTime(patArchive.getCreateTime());
            patTaskRelevance.setCreateBy(patArchive.getCreateBy());
            patTaskRelevance.setDeptName(patArchive.getDept());
            PatTaskRelevances.add(patTaskRelevance);
        }
        return PatTaskRelevances;
    }
    @Override
    @Transactional
    public PatUpInfoVO importFilehandle(SysUser user, String tags, MultipartFile file) {
smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
@@ -110,7 +110,8 @@
            <if test="groupid != null  and groupid != ''">and groupid = #{groupid}</if>
            <if test="targettype != null  and targettype != ''">and targettype = #{targettype}</if>
            <if test="targetname != null  and targetname != ''">and targetname like concat('%', #{targetname}, '%')</if>
            <if test="scriptType != null  and scriptType != ''">and script_type like concat('%', #{scriptType}, '%')</if>
            <if test="scriptType != null  and scriptType != ''">and script_type like concat('%', #{scriptType}, '%')
            </if>
            <if test="targetdesc != null  and targetdesc != ''">and targetdesc = #{targetdesc}</if>
            <if test="language != null  and language != ''">and language = #{language}</if>
            <if test="version != null ">and version = #{version}</if>
@@ -124,10 +125,10 @@
            <if test="pid != null ">and pid = #{pid}</if>
            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
            <if test="assortid != null ">and assortid = #{assortid}</if>
            <if test="isAvailable != null">and isAvailable=#{isAvailable},</if>
            <if test="suitDisease != null and suitDisease != ''">and suitDisease = #{suitDisease},</if>
            <if test="suitWay != null and suitWay != ''">and suitWay = #{suitWay},</if>
            <if test="parameter != null and parameter != ''">and parameter = #{parameter},</if>
            <if test="isAvailable != null">and isAvailable=#{isAvailable}</if>
            <if test="suitDisease != null and suitDisease != ''">and suitDisease = #{suitDisease}</if>
            <if test="suitWay != null and suitWay != ''">and suitWay like concat('%', #{suitWay}, '%')</if>
            <if test="parameter != null and parameter != ''">and parameter = #{parameter}</if>
        </where>
    </select>
@@ -182,10 +183,10 @@
            <if test="pid != null ">and a.pid = #{pid}</if>
            <if test="guid != null  and guid != ''">and a.guid = #{guid}</if>
            <if test="assortid != null ">and a.assortid = #{assortid}</if>
            <if test="isAvailable != null">a.isAvailable=#{isAvailable},</if>
            <if test="suitDisease != null and suitDisease != ''">a.suitDisease = #{suitDisease},</if>
            <if test="suitWay != null and suitWay != ''">a.suitWay = #{suitWay},</if>
            <if test="parameter != null and parameter != ''">a.parameter = #{parameter},</if>
            <if test="isAvailable != null">a.isAvailable=#{isAvailable}</if>
            <if test="suitDisease != null and suitDisease != ''">a.suitDisease = #{suitDisease}</if>
            <if test="suitWay != null and suitWay != ''">a.suitWay like concat('%', #{suitWay}, '%')</if>
            <if test="parameter != null and parameter != ''">a.parameter = #{parameter}</if>
        </where>
        ORDER BY a.targetID
    </select>
smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml
@@ -34,12 +34,14 @@
        <result property="orderno" column="orderno"/>
        <result property="appendflag" column="appendflag"/>
        <result property="appenddesc" column="appenddesc"/>
        <result property="picturePath" column="picture_path"/>
    </resultMap>
    <sql id="selectIvrLibaTargetoptionVo">
        select targetoptionid,
               targetid,
               appendflag,
               picture_path,
               appenddesc,
               targettype,
               categoryName,
@@ -83,6 +85,7 @@
            <if test="dynamiccruxsJson != null">and dynamiccruxs = #{dynamiccruxsJson}</if>
            <if test="appendflag != null">and appendflag = #{appendflag}</if>
            <if test="appenddesc != null">and appenddesc = #{appenddesc}</if>
            <if test="picturePath != null">and picture_path = #{picturePath}</if>
        </where>
        order by guid asc
    </select>
@@ -124,6 +127,7 @@
            <if test="orderno != null">orderno,</if>
            <if test="appendflag != null">appendflag,</if>
            <if test="appenddesc != null">appenddesc,</if>
            <if test="picturePath != null">picture_path,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="targetid != null">#{targetid},</if>
@@ -154,6 +158,7 @@
            <if test="orderno != null">#{orderno},</if>
            <if test="appendflag != null">#{appendflag},</if>
            <if test="appenddesc != null">#{appenddesc},</if>
            <if test="picturePath != null">#{picturePath},</if>
        </trim>
    </insert>
@@ -188,6 +193,7 @@
            <if test="orderno != null">orderno = #{orderno},</if>
            <if test="appendflag != null">appendflag = #{appendflag},</if>
            <if test="appenddesc != null">appenddesc = #{appenddesc},</if>
            <if test="picturePath != null">picture_path = #{picturePath},</if>
        </trim>
        where targetoptionid = #{targetoptionid}
    </update>
smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml
@@ -94,7 +94,7 @@
            <if test="language != null  and language != ''">and language = #{language}</if>
            <if test="scoretype != null  and scoretype != ''">and scoretype = #{scoretype}</if>
            <if test="score != null  and score != ''">and score = #{score}</if>
            <if test="scriptTopic != null  and scriptTopic != ''">and script_topic = #{scriptTopic}</if>
            <if test="scriptTopic != null  and scriptTopic != ''">and script_topic like concat('%', #{scriptTopic}, '%')</if>
            <if test="targetid != null ">and targetid = #{targetid}</if>
            <if test="targetname != null  and targetname != ''">and targetname = #{targetname}</if>
            <if test="targettype != null  and targettype != ''">and targettype = #{targettype}</if>
smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml
@@ -121,7 +121,7 @@
    <select id="selectSeqMax" resultType="integer">
        select max(seqno) seqno
        from iivr_liba_template_assort
        from ivr_liba_template_assort
    </select>
</mapper>