代码修改

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

@@ -341,6 +341,7 @@ public class PatientRehabilitationManageController extends EnvelopRestEndpoint {
            @RequestParam(value = "planId", required = false)String planId,
            @ApiParam(name = "patient", value = "居民id", required = false)
            @RequestParam(value = "patient", required = false)String patient,
            @ApiParam(name = "diseaseId", value = "专病id", required = false) @RequestParam(value = "diseaseId", required = false) String diseaseId,
            @ApiParam(name = "searchTask", value = "快速查找任务：（1电话/短信关怀,2康复咨询,3健康监测,4上门服务,5康复指导,6康复随访,7康复复诊 8全部）", required = false)
            @RequestParam(value = "searchTask", required = false)Integer searchTask,
            @ApiParam(name = "doctorCode", value = "医生code（专科医生、家庭医生）", required = false)
@@ -354,7 +355,7 @@ public class PatientRehabilitationManageController extends EnvelopRestEndpoint {
            if(!StringUtils.isNotEmpty(doctorCode)){
                doctorCode = getRepUID();
            }
            return rehabilitationManageService.calendarPlanDetailList(planId, searchTask, status, doctorCode, executeStartTime, executeEndTime, taskExecutor,patient);
            return rehabilitationManageService.calendarPlanDetailList(planId, searchTask, status, doctorCode, executeStartTime, executeEndTime, taskExecutor,patient,diseaseId);
        }  catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("查询失败");

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

@@ -184,13 +184,14 @@ public class RehabilitationManageController extends EnvelopRestEndpoint {
            @ApiParam(name = "executeEndTime", value = "日历结束时间（格式：yyyy-MM-dd）") @RequestParam(value = "executeEndTime", required = false) String executeEndTime,
            @ApiParam(name = "planId", value = "计划id,多个计划逗号隔开", required = false) @RequestParam(value = "planId", required = false) String planId,
            @ApiParam(name = "patient", value = "居民id", required = false) @RequestParam(value = "patient", required = false) String patient,
            @ApiParam(name = "diseaseId", value = "专病id", required = false) @RequestParam(value = "diseaseId", required = false) String diseaseId,
            @ApiParam(name = "searchTask", value = "快速查找任务：（1电话/短信关怀,2康复咨询,3健康监测,4上门服务,5康复指导,6康复随访,7康复复诊）", required = false) @RequestParam(value = "searchTask", required = false) Integer searchTask,
            @ApiParam(name = "status", value = "任务状态（0未完成，1已完成，2已预约）", required = false) @RequestParam(value = "status", required = false) Integer status,
            @ApiParam(name = "doctorCode", value = "医生code（专科医生、家庭医生）", required = false) @RequestParam(value = "doctorCode", required = false) String doctorCode,
            @ApiParam(name = "taskExecutor", value = "任务执行人：0全部；1我的任务：2他人任务", required = false) @RequestParam(value = "taskExecutor", required = false, defaultValue = "0") String taskExecutor
    ) {
        try {
            return rehabilitationManageService.calendarPlanDetail(executeStartTime, executeEndTime, planId, searchTask, status, doctorCode, taskExecutor,patient);
            return rehabilitationManageService.calendarPlanDetail(executeStartTime, executeEndTime, planId, searchTask, status, doctorCode, taskExecutor,patient,diseaseId);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError("获取失败");
@@ -205,13 +206,14 @@ public class RehabilitationManageController extends EnvelopRestEndpoint {
            @ApiParam(name = "executeEndTime", value = "日历结束时间（格式：yyyy-MM-dd）") @RequestParam(value = "executeEndTime", required = false) String executeEndTime,
            @ApiParam(name = "planId", value = "计划id,多个计划逗号隔开", required = false) @RequestParam(value = "planId", required = false) String planId,
            @ApiParam(name = "patient", value = "居民id", required = false) @RequestParam(value = "patient", required = false) String patient,
            @ApiParam(name = "diseaseId", value = "专病id", required = false) @RequestParam(value = "diseaseId", required = false) String diseaseId,
            @ApiParam(name = "searchTask", value = "快速查找任务：（1电话/短信关怀,2康复咨询,3健康监测,4上门服务,5康复指导,6康复随访,7康复复诊 8所有）") @RequestParam(value = "searchTask", required = false) Integer searchTask,
            @ApiParam(name = "status", value = "任务状态（0未完成，1已完成，2已预约）") @RequestParam(value = "status", required = false) Integer status,
            @ApiParam(name = "doctorCode", value = "医生code（专科医生、家庭医生）") @RequestParam(value = "doctorCode", required = false) String doctorCode,
            @ApiParam(name = "taskExecutor", value = "任务执行人：0全部；1我的任务：2他人任务", required = false) @RequestParam(value = "taskExecutor", required = false, defaultValue = "0") String taskExecutor
    ) {
        try {
            return rehabilitationManageService.calendarPlanDetailList(planId, searchTask, status, doctorCode, executeStartTime, executeEndTime, taskExecutor,patient);
            return rehabilitationManageService.calendarPlanDetailList(planId, searchTask, status, doctorCode, executeStartTime, executeEndTime, taskExecutor,patient,diseaseId);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError(e.getMessage());

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

@@ -589,10 +589,10 @@ public class RehabilitationManageService {
     * @param taskExecutor 任务执行者 0全部；1我的任务 2他人任务
     */
    public ObjEnvelop calendarPlanDetail(String executeStartTime, String executeEndTime, String planId, Integer searchTask,
                                         Integer status, String doctorCode, String taskExecutor,String patient) throws Exception {
        String sql = " select d.* from base_service_item_plan d  where ";
                                         Integer status, String doctorCode, String taskExecutor,String patient,String diseaseId) throws Exception {
        String sql = " select d.* from base_service_item_plan d,wlyy_patient_rehabilitation_plan p  where d.plan_id=p.id ";
        if(StringUtils.isNotBlank(patient)){
            sql += "  d.patient = '" + patient + "' ";
            sql += " and  d.patient = '" + patient + "' ";
        }else {
            String[] planIdlist = planId.split(",");
            StringBuilder planCondition = new StringBuilder();
@@ -600,7 +600,10 @@ public class RehabilitationManageService {
            for (int i = 1; i < planIdlist.length; i++) {
                planCondition.append(",'" + planIdlist[i] + "'");
            }
            sql += "  d.plan_id in (" + planCondition + " ) ";
            sql += " and  d.plan_id in (" + planCondition + " ) ";
        }
        if(StringUtils.isNotBlank(diseaseId)){
            sql += " and  p.disease = '" + diseaseId + "' ";
        }
        if (StringUtils.isNotBlank(executeStartTime)) {
            sql += " and d.plan_time>='" + executeStartTime + "' ";
@@ -694,11 +697,11 @@ public class RehabilitationManageService {
     * @param taskExecutor 任务执行者 0全部；1我的任务 2他人任务
     */
    public ObjEnvelop calendarPlanDetailList(String planId, Integer searchTask, Integer status, String doctorCode,
                                             String executeStartTime, String executeEndTime, String taskExecutor,String patient) {
                                             String executeStartTime, String executeEndTime, String taskExecutor,String patient,String diseaseId) {
        String sql = " select d.* from base_service_item_plan d  where ";
        String sql = " select d.* from base_service_item_plan d,wlyy_patient_rehabilitation_plan p  where d.plan_id=p.id ";
        if(StringUtils.isNotBlank(patient)){
            sql += "  d.patient = '" + patient + "' ";
            sql += " and  d.patient = '" + patient + "' ";
        }else {
            String[] planIdlist = planId.split(",");
            StringBuilder planCondition = new StringBuilder();
@@ -706,7 +709,10 @@ public class RehabilitationManageService {
            for (int i = 1; i < planIdlist.length; i++) {
                planCondition.append(",'" + planIdlist[i] + "'");
            }
            sql += "  d.plan_id in (" + planCondition + " ) ";
            sql += " and  d.plan_id in (" + planCondition + " ) ";
        }
        if(StringUtils.isNotBlank(diseaseId)){
            sql += " and  p.disease = '" + diseaseId + "' ";
        }
        if (searchTask != null) {
@@ -1624,7 +1630,7 @@ public class RehabilitationManageService {
    public ObjEnvelop appCalendarPlanDetailList(String planId, Integer searchTask, Integer status, String executeStartTime, String executeEndTime) {
        Map<String, Object> resultMap = new HashMap<>();
        ObjEnvelop objEnvelop = calendarPlanDetailList(planId, searchTask, status, null, executeStartTime, executeEndTime, "0",null);
        ObjEnvelop objEnvelop = calendarPlanDetailList(planId, searchTask, status, null, executeStartTime, executeEndTime, "0",null,null);
        Integer finishCount = rehabilitationDetailDao.findByStatusAndPlanId(1, planId);
        Integer allCount = rehabilitationDetailDao.findAllByPlanId(planId);
        resultMap.put("planDetailList", objEnvelop.getObj());
@@ -2686,7 +2692,7 @@ public class RehabilitationManageService {
        param.put("taskExecutor", taskExecutor);
        ObjEnvelop objEnvelop = calendarPlanDetailList(planIds.toString(), searchTask, status, doctorCode, executeStartTime, executeEndTime, taskExecutor,null);
        ObjEnvelop objEnvelop = calendarPlanDetailList(planIds.toString(), searchTask, status, doctorCode, executeStartTime, executeEndTime, taskExecutor,null,null);
        org.json.JSONObject result = new org.json.JSONObject(objEnvelop);
        if (result.getInt("status") == 200) {

svr/svr-visit-behind/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name:  svr-visit-behind --
    name:  svr-visit-behind--
  cloud:
    config:
      failFast: true