陈昶聿
15 小时以前 e2a8c2e004a7ef5942994ad47e350576339413ef
【本地】预入院查询
已修改4个文件
29 ■■■■ 文件已修改
smartor/src/main/java/com/smartor/domain/PatMedInhosp.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
@@ -378,7 +378,7 @@
    /**
     * 出入院标识
     */
    @ApiModelProperty("出入院标识:0入院  1出院  ")
    @ApiModelProperty("出入院标识:0入院  1出院 2 转科  3 预入院")
    private Integer cry;
    /**
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -90,14 +90,18 @@
     */
    @Override
    public List<PatMedInhosp> selectPatMedInhospList(PatMedInhosp patMedInhosp) {
        if (patMedInhosp.getCry() == 0) {
        if (patMedInhosp.getCry() != null && patMedInhosp.getCry() == 0) {
            patMedInhosp.setDeptcodeList(patMedInhosp.getLeaveldeptcodes());
            patMedInhosp.setHospitaldistrictcodeList(patMedInhosp.getLeavehospitaldistrictcodes());
            patMedInhosp.setLeaveldeptcodes(null);
            patMedInhosp.setLeavehospitaldistrictcodes(null);
            patMedInhosp.setInhospstate("0");
        } else if (patMedInhosp.getCry() == 1) {
        } else if (patMedInhosp.getCry() != null && patMedInhosp.getCry() == 1) {
            patMedInhosp.setInhospstate("1");
        } else if (patMedInhosp.getCry() != null && patMedInhosp.getCry() == 2) {
            patMedInhosp.setInhospstate("2");
        } else if (patMedInhosp.getCry() != null && patMedInhosp.getCry() == 3) {
            patMedInhosp.setInhospstate("3");
        }
        List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -403,6 +403,13 @@
                serviceSubtaskRes.setSendstateView(1L);
            if (serviceSubtaskRes.getSendstate() == 6) serviceSubtaskRes.setSendstateView(2L);
            if (serviceSubtaskRes.getSendstate() == 4) serviceSubtaskRes.setSendstateView(3L);
            // 填充当前补偿
            if (StringUtils.isEmpty(serviceSubtask.getCurrentPreachform())){
                if(StringUtils.isNotEmpty(serviceSubtask.getPreachform())){
                    //默认取第一个
                    serviceSubtaskRes.setCurrentPreachform(serviceSubtask.getPreachform().split(",")[0]);
                }
            }
            serviceSubtaskResList.add(serviceSubtaskRes);
        }
        return serviceSubtaskResList;
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -259,6 +259,8 @@
        <if test="diagcheckFlag != null ">and b.diagcheck_flag = #{diagcheckFlag}</if>
        <if test="cry != null and cry == 0 ">and b.endtime is null</if>
        <if test="cry != null and cry == 1 ">and b.inhospstate=1</if>
        <if test="cry != null and cry == 2 ">and b.inhospstate=2</if>
        <if test="cry != null and cry == 3 ">and b.inhospstate=3</if>
        <if test="inhospstate != null ">and b.inhospstate = #{inhospstate}</if>
        <if test="campusid != null ">and b.campusid = #{campusid}</if>
        <if test="schemestatus != null ">and b.schemestatus = #{schemestatus}</if>
@@ -317,10 +319,16 @@
        a.telcode,
        a.id,
        a.sex
        <if test="cry==1">
        <if test="cry != null and cry==1">
            order by b.endtime desc
        </if>
        <if test="cry==0">
        <if test="cry != null and cry==2">
            order by b.endtime desc
        </if>
        <if test="cry != null and cry==3">
            order by b.endtime desc
        </if>
        <if test="cry != null and cry==0">
            order by b.starttime desc
        </if>
    </select>