代码修改

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/controller/RehabilitationManageController.java

@@ -61,9 +61,13 @@ public class RehabilitationManageController extends EnvelopRestEndpoint {
    @ApiOperation("康复计划服务项列表")
    public Envelop rehabilitationDetailInfo(
            @ApiParam(name = "planId", value = "康复计划id", required = true)
            @RequestParam(value = "planId", required = true) String planId) {
            @RequestParam(value = "planId", required = true) String planId,
            @ApiParam(name = "searchTask", value = "快速查找任务：（1电话/短信关怀,2康复咨询,3健康监测,4上门服务,5康复指导,6康复随访,7康复复诊）", required = false)
            @RequestParam(value = "searchTask", required = false) String searchTask,
            @ApiParam(name = "status", value = "任务状态（0未完成，1已完成，2已预约）", required = false)
            @RequestParam(value = "status", required = false) String status) {
        try {
            return ListEnvelop.getSuccess("查询成功",rehabilitationManageService.rehabilitationDetailInfo(planId));
            return ListEnvelop.getSuccess("查询成功",rehabilitationManageService.rehabilitationDetailInfo(planId,status,searchTask));
        }catch (ServiceException se){
            return Envelop.getError(se.getMessage());
        }catch (Exception e) {

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/RehabilitationManageService.java

@@ -1323,8 +1323,16 @@ public class RehabilitationManageService {
    }
    //康复计划服务项列表
    public List<RehabilitationDetailDO> rehabilitationDetailInfo(String planId){
        List<RehabilitationDetailDO> detailDOList = rehabilitationDetailDao.getAllRehabilitationDetail(planId);
    public List<RehabilitationDetailDO> rehabilitationDetailInfo(String planId,String status,String searchTask){
        String sql = "select * from wlyy_rehabilitation_plan_detail where plan_id='"+planId+"' ";
        if(StringUtils.isNotBlank(status)){
            sql += " and status="+status;
        }
        if(StringUtils.isNotBlank(searchTask)){
            sql += " and hospital_service_item_id='"+searchTask+"' ";
        }
        sql += " order by hospital_service_item_id";
        List<RehabilitationDetailDO> detailDOList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(RehabilitationDetailDO.class));
        List<RehabilitationServiceItemDO> itemDOList = serviceItemDao.findList();
        Map<String, String> serviceItemMap = itemDOList.stream().collect(Collectors.toMap(RehabilitationServiceItemDO::getCode, RehabilitationServiceItemDO::getName));
        List<ServiceItemPlanDO> planDOList = serviceItemPlanDao.findByPlanId(planId);