【丽水】1、手术随访任务生成检索加条件：必须出院时间不为空的数据 2、手术随访任务生成不影响出院随访

陈昶聿

8 天以前 dcf411b7b5d4158139adf0337c3831fbff31b652

【丽水】1、手术随访任务生成检索加条件：必须出院时间不为空的数据
2、手术随访任务生成不影响出院随访

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

@@ -1187,9 +1187,12 @@
        if (!Objects.isNull(patMedInhosp1.getEndtime())) {
            newDate = addDays(patMedInhosp1.getEndtime(), serviceTask.getSendDay().intValue());
        } else {
            patMedInhosp1.setDeptcheckFlag("2");
            patMedInhosp1.setRemark(patMedInhosp1.getRemark() + "& 该患者手术出院时间为空,出院记录ID为:" + patMedInhosp1.getInhospid());
            patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
            patMedOperationItem.setOpercheckFlag("2");
            patMedOperationItem.setRemark(patMedOperationItem.getRemark() + "& 该患者手术出院时间为空,手术详情ID为:" + patMedOperationItem.getId());
            patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem);
//            patMedInhosp1.setDeptcheckFlag("2");
//            patMedInhosp1.setRemark(patMedInhosp1.getRemark() + "& 该患者手术出院时间为空,出院记录ID为:" + patMedInhosp1.getInhospid());
//            patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
            //如果出院时间为空，则返回一个新对象
            return new ServiceSubtask();
        }

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

@@ -514,6 +514,9 @@
        </if>
        <if test="inhospstate != null and inhospstate != ''">
            and pmi.inhospstate = #{inhospstate}
            <if test="inhospstate == '1'">
                and pmi.endtime is not null
            </if>
        </if>
        <if test="serialnum != null and serialnum != ''">
            and pmo.serialnum = #{serialnum}