Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

business/base-service/src/main/java/com/yihu/jw/wlyy/service/WlyyBusinessService.java

@@ -1071,4 +1071,31 @@ public class WlyyBusinessService {
        return re;
    }
    public JSONObject calendarPlanDetail_IJK(String executeStartTime, String executeEndTime, String planId, String searchTask, String doctorCode, String status, String taskExecutor) {
        String param = "?executeStartTime=" + nullToTransfor(executeStartTime) + "&executeEndTime=" + nullToTransfor(executeEndTime) + "&planId=" + nullToTransfor(planId);
        if (StringUtils.isNotBlank(searchTask)) {
            param += "&searchTask=" + nullToTransfor(searchTask);
        }
        if (StringUtils.isNotBlank(status)) {
            param += "&status=" + nullToTransfor(status);
        }
        param += "&doctorCode=" + nullToTransfor(doctorCode) + "&taskExecutor=" + nullToTransfor(String.valueOf(taskExecutor));
        JSONObject re = wlyyHttpService.sendWlyyMesGet("calendarPlanDetail_IJK", param);
        return re;
    }
    public JSONObject calendarPlanDetailBypatient_IJK(String executeStartTime, String executeEndTime, String patient, String searchTask, String doctorCode, String status, String taskExecutor) {
        String param = "?executeStartTime=" + nullToTransfor(executeStartTime) + "&executeEndTime=" + nullToTransfor(executeEndTime) + "&patient=" + nullToTransfor(patient);
        if (StringUtils.isNotBlank(searchTask)) {
            param += "&searchTask=" + nullToTransfor(searchTask);
        }
        if (StringUtils.isNotBlank(status)) {
            param += "&status=" + nullToTransfor(status);
        }
        param += "&doctorCode=" + nullToTransfor(doctorCode) + "&taskExecutor=" + nullToTransfor(String.valueOf(taskExecutor));
        JSONObject re = wlyyHttpService.sendWlyyMesGet("calendarPlanDetailBypatient_IJK", param);
        return re;
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/specialist/BaseDiseaseHospitalController.java

@@ -11,6 +11,7 @@ import com.yihu.jw.wlyy.service.WlyyBusinessService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -501,4 +502,45 @@ public class BaseDiseaseHospitalController extends EnvelopRestEndpoint {
    }
    @RequestMapping(value = "calendarPlanDetail_IJK", method = RequestMethod.GET)
    @ApiOperation("康复管理-康复计划按日历展示")
    public Envelop calendarPlanDetail_IJK(
            @ApiParam(name = "executeStartTime", value = "日历开始时间（格式：yyyy-MM-dd HH:mm:ss）") @RequestParam(value = "executeStartTime", required = false) String executeStartTime,
            @ApiParam(name = "executeEndTime", value = "日历结束时间（格式：yyyy-MM-dd HH:mm:ss）") @RequestParam(value = "executeEndTime", required = false) String executeEndTime,
            @ApiParam(name = "planId", value = "计划id", required = true) @RequestParam(value = "planId") String planId,
            @ApiParam(name = "searchTask", value = "快速查找任务：（1电话/短信关怀,2康复咨询,3健康监测,4上门服务,5康复指导,6康复随访,7康复复诊）", required = false) @RequestParam(value = "searchTask", required = false) String searchTask,
            @ApiParam(name = "doctorCode", value = "医生code（专科医生、家庭医生）", required = false) @RequestParam(value = "doctorCode", required = false) String doctorCode,
            @ApiParam(name = "status", value = "任务状态（0未完成，1已完成，2已预约）", required = false) @RequestParam(value = "status", required = false) String status,
            @ApiParam(name = "taskExecutor", value = "任务执行人：0全部；1我的任务：2他人任务", required = false) @RequestParam(value = "taskExecutor", required = false, defaultValue = "0") String taskExecutor) {
        try {
            JSONObject result = wlyyBusinessService.calendarPlanDetail_IJK(executeStartTime,executeEndTime,planId,searchTask,doctorCode,status,taskExecutor);
            return success(result);
        } catch (Exception e) {
            return failedException(e);
        }
    }
    @RequestMapping(value = "calendarPlanDetailBypatient_IJK", method = RequestMethod.GET)
    @ApiOperation("康复管理--某患者的康复计划按日历展示")
    public Envelop calendarPlanDetailBypatient_IJK(
            @ApiParam(name = "executeStartTime", value = "日历开始时间（格式：yyyy-MM-dd HH:mm:ss）", required = false) @RequestParam(value = "executeStartTime", required = false) String executeStartTime,
            @ApiParam(name = "executeEndTime", value = "日历结束时间（格式：yyyy-MM-dd HH:mm:ss）", required = false) @RequestParam(value = "executeEndTime", required = false) String executeEndTime,
            @ApiParam(name = "patient", value = "患者code", required = true) @RequestParam(value = "patient", required = true) String patient,
            @ApiParam(name = "searchTask", value = "快速查找任务：（1电话/短信关怀,2康复咨询,3健康监测,4上门服务,5康复指导,6康复随访,7康复复诊）", required = false) @RequestParam(value = "searchTask", required = false) String searchTask,
            @ApiParam(name = "doctorCode", value = "医生code（专科医生、家庭医生）", required = false) @RequestParam(value = "doctorCode", required = false) String doctorCode,
            @ApiParam(name = "status", value = "任务状态（0未完成，1已完成，2已预约）", required = false) @RequestParam(value = "status", required = false) String status,
            @ApiParam(name = "taskExecutor", value = "任务执行人：0全部；1我的任务：2他人任务", required = false) @RequestParam(value = "taskExecutor", required = false, defaultValue = "0") String taskExecutor
    ) {
        try {
            JSONObject result = wlyyBusinessService.calendarPlanDetailBypatient_IJK(executeStartTime,executeEndTime,patient,searchTask,doctorCode,status,taskExecutor);
            return success(result);
        } catch (Exception e) {
            return failedException(e);
        }
    }
}