ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java

@@ -11,9 +11,11 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.BaseOrganization;
import com.smartor.domain.PatArchive;
import com.smartor.domain.ServiceOutPath;
import com.smartor.domain.ServiceTask;
import com.smartor.service.IBaseOrganizationService;
import com.smartor.service.IPatArchiveService;
import com.smartor.service.IServiceOutPathService;
import com.smartor.service.IServiceTaskService;
import io.swagger.annotations.Api;
@@ -42,6 +44,9 @@

    @Autowired
    private IServiceTaskService serviceTaskService;

    @Autowired
    IPatArchiveService patArchiveService;

    @Autowired
    private IBaseOrganizationService baseOrganizationService;
@@ -90,6 +95,15 @@
                    serviceOutPath1.setOrgname(orgname);
                }
            }
            if(StringUtils.isNotEmpty(serviceOutPath1.getParam2())){
                RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
                Long patId = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceOutPath1.getParam2(), pri_key));
                if(patId != null){
                    PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(patId);
                    serviceOutPath1.setPatArchive(patArchive);
                }
            }

            return success(serviceOutPath1);
        }
        return success(null);

 smartor/pom.xml

@@ -145,6 +145,10 @@
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
        </dependency>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-system</artifactId>
        </dependency>
    </dependencies>



 smartor/src/main/java/com/smartor/domain/ServiceOutPath.java

@@ -68,5 +68,8 @@
    @ApiModelProperty(value = "进制")
    private String radix;

    @ApiModelProperty(value = "病人信息")
    private PatArchive patArchive;

}


 smartor/src/main/java/com/smartor/domain/ServiceSubtask.java

@@ -694,4 +694,32 @@
    @ApiModelProperty(value = "疾病病种")
    @Excel(name = " 疾病病种")
    private String diagType;

    /**
     * 开始出院日期
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "开始出院日期")
    private Date startOutHospTime;

    /**
     * 结束出院日期
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "结束出院日期")
    private Date endOutHospTime;

    /**
     * 开始发送日期
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "开始发送日期")
    private Date startSendDateTime;

    /**
     * 结束发送日期
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "结束发送日期")
    private Date endSendDateTime;
}

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

@@ -858,6 +858,12 @@
        <if test="continueTimeNow != null ">and continue_time_now = #{continueTimeNow,jdbcType=TIMESTAMP}</if>
        <if test="continueCount != null ">and continue_count = #{continueCount}</if>
        <if test="continueTimeNext != null ">and continue_time_next = #{continueTimeNext}</if>
        <if test="startOutHospTime != null">
            AND date_format(endtime,'%y%m%d') &gt;= date_format(#{startOutHospTime},'%y%m%d')
        </if>
        <if test="endOutHospTime != null">
            AND date_format(endtime,'%y%m%d') &lt;= date_format(#{endOutHospTime},'%y%m%d')
        </if>
        GROUP BY sendname,sendstate,starttime,endtime,nurse_name,phone,sex,task_name,leavediagname,visit_time
        ORDER BY sendname,visit_time
        <if test="pageSize != null  and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>