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

business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@@ -21,6 +21,7 @@ import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.jw.restmodel.hospital.statistics.ScreenQvo;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.jw.wlyy.wlyyhttp.WlyyHttpService;
import jxl.Workbook;
import jxl.format.VerticalAlignment;
import jxl.write.*;
@@ -81,6 +82,8 @@ public class StatisticsEsService {
    @Autowired
    private WlyyHospitalSysDictDao sysDictDao;//字典
    @Autowired
    WlyyHttpService wlyyHttpService;
    /**
@@ -6254,17 +6257,23 @@ public class StatisticsEsService {
    public JSONObject getConsultAndPrescriptionList(ScreenQvo qvo) throws Exception {
        JSONObject result = new JSONObject();
        if (qvo.getFlag() == 1) {
            //本月
            qvo.setStartDate(DateUtil.getFirstMonthDay());
            qvo.setEndDate(DateUtil.getLastMonthDay());
            if (StringUtils.isBlank(qvo.getStartDate())) {
                //本月
                qvo.setStartDate(DateUtil.getFirstMonthDay());
                qvo.setEndDate(DateUtil.getLastMonthDay());
            }
        } else if (qvo.getFlag() == 2) {
            //近半年
            qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6));
            qvo.setEndDate(DateUtil.getStringDateShort());
            if (StringUtils.isBlank(qvo.getStartDate())) {
                //近半年
                qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6));
                qvo.setEndDate(DateUtil.getStringDateShort());
            }
        } else if (qvo.getFlag() == 3) {
            //全年
            qvo.setStartDate(DateUtil.getCurrentYearStartTime());
            qvo.setEndDate(DateUtil.getCurrentYearEndTime());
            if (StringUtils.isBlank(qvo.getStartDate())) {
                //全年
                qvo.setStartDate(DateUtil.getCurrentYearStartTime());
                qvo.setEndDate(DateUtil.getCurrentYearEndTime());
            }
        }
        HashMap<String, String> map = new HashMap<>();
@@ -7672,4 +7681,22 @@ public class StatisticsEsService {
    }
    /**
     * 调用i健康的接口查询家庭信息【市民健康】
     */
    public JSONObject getFamilyRelationByIjk(ScreenQvo qvo) {
        String param = "?idCard=" + qvo.getIdcard();
        JSONObject re = wlyyHttpService.sendWlyyMesGet("getHospitalList", param);
        return re;
    }
    /**
     * 调用i健康就诊情况
     */
    public JSONObject getEventByIjk(ScreenQvo qvo) {
        String param = "?&ssc=" + qvo.getSsc() + "&type=1&page=1&pageSize=20";
        JSONObject re = wlyyHttpService.sendWlyyMesGet("getEventList", param);
        return re;
    }
}

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -1091,6 +1091,7 @@ public class ImService {
        // 添加医生咨询日志
        String content = addLogs(ct);
        re.put("doctor", doctor);
        re.put("title", title);
        re.put("doctorName", baseDoctorDO.getName());
        re.put("status", 1);
        re.put("sessiond_id", patient + "_" + doctor + "_" + ct.getType());

common/common-entity/src/main/java/com/yihu/jw/entity/base/im/ConsultDo.java

@@ -23,7 +23,7 @@ public class ConsultDo extends UuidIdentityEntity {
	private String patient;
	// 咨询类型：1三师咨询，2视频咨询，3图文咨询，4公共咨询，
	//          5病友圈 6、患者名医咨询 7医生名医咨询 8续方咨询
	//          9在线复诊咨询（居民直接咨询专家） 10医生发起的求助 11思明区上门服务在线咨询
	//          9在线复诊咨询（居民直接咨询专家） 10医生发起的求助 11思明区上门服务在线咨询 28康复咨询
	private Integer type;
	// 咨询标题/主诉
	private String title;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/statistics/ScreenQvo.java

@@ -12,137 +12,154 @@ public class ScreenQvo {
//   lowLevel  下一级区域等级
    private String startDate;//开始时间
    private String endDate;//结束时间
   private String startDate;//开始时间
   private String endDate;//结束时间
    private String area;//区域code
    private int level;//等级
    private String index;//指标
   private String area;//区域code
   private int level;//等级
   private String index;//指标
    private int flag;//1本月 2近半年 3全年
   private int flag;//1本月 2近半年 3全年
    private String timeType;//查询时间范围 1 按天  3按月
   private String timeType;//查询时间范围 1 按天  3按月
    private String deptCode;//科室code
    private String deptName;//科室名称
    private String doctorName;//医生名称
   private String deptCode;//科室code
   private String deptName;//科室名称
   private String doctorName;//医生名称
    private int page;
    private int pageSize;
    private String pageSwitch;//1是0否  分页开关
    private String type;//类型
    private String idcard;
    private String ssc;//社保卡号
   private int page;
   private int pageSize;
   private String pageSwitch;//1是0否  分页开关
   private String type;//类型
    public String getIdcard() {
        return idcard;
    }
   public String getDeptName() {
      return deptName;
   }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
   public void setDeptName(String deptName) {
      this.deptName = deptName;
   }
    public String getDeptName() {
        return deptName;
    }
   public String getType() {
      return type;
   }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
   public void setType(String type) {
      this.type = type;
   }
    public String getType() {
        return type;
    }
   public int getFlag() {
      return flag;
   }
    public void setType(String type) {
        this.type = type;
    }
   public void setFlag(int flag) {
      this.flag = flag;
   }
    public int getFlag() {
        return flag;
    }
   public String getStartDate() {
      return startDate;
   }
    public void setFlag(int flag) {
        this.flag = flag;
    }
   public void setStartDate(String startDate) {
      this.startDate = startDate;
   }
    public String getStartDate() {
        return startDate;
    }
   public String getEndDate() {
      return endDate;
   }
    public void setStartDate(String startDate) {
        this.startDate = startDate;
    }
   public void setEndDate(String endDate) {
      this.endDate = endDate;
   }
    public String getEndDate() {
        return endDate;
    }
   public String getArea() {
      return area;
   }
    public void setEndDate(String endDate) {
        this.endDate = endDate;
    }
   public void setArea(String area) {
      this.area = area;
   }
    public String getArea() {
        return area;
    }
   public int getLevel() {
      return level;
   }
    public void setArea(String area) {
        this.area = area;
    }
   public void setLevel(int level) {
      this.level = level;
   }
    public int getLevel() {
        return level;
    }
   public String getIndex() {
      return index;
   }
    public void setLevel(int level) {
        this.level = level;
    }
   public void setIndex(String index) {
      this.index = index;
   }
    public String getIndex() {
        return index;
    }
   public String getTimeType() {
      return timeType;
   }
    public void setIndex(String index) {
        this.index = index;
    }
   public void setTimeType(String timeType) {
      this.timeType = timeType;
   }
    public String getTimeType() {
        return timeType;
    }
   public int getPage() {
      return page;
   }
    public void setTimeType(String timeType) {
        this.timeType = timeType;
    }
   public void setPage(int page) {
      this.page = page;
   }
    public int getPage() {
        return page;
    }
   public int getPageSize() {
      return pageSize;
   }
    public void setPage(int page) {
        this.page = page;
    }
   public void setPageSize(int pageSize) {
      this.pageSize = pageSize;
   }
    public int getPageSize() {
        return pageSize;
    }
   public String getPageSwitch() {
      return pageSwitch;
   }
    public void setPageSize(int pageSize) {
        this.pageSize = pageSize;
    }
   public void setPageSwitch(String pageSwitch) {
      this.pageSwitch = pageSwitch;
   }
    public String getPageSwitch() {
        return pageSwitch;
    }
   public String getDeptCode() {
      return deptCode;
   }
    public void setPageSwitch(String pageSwitch) {
        this.pageSwitch = pageSwitch;
    }
   public void setDeptCode(String deptCode) {
      this.deptCode = deptCode;
   }
    public String getDeptCode() {
        return deptCode;
    }
    public void setDeptCode(String deptCode) {
        this.deptCode = deptCode;
    }
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
   public String getDoctorName() {
      return doctorName;
   public String getSsc() {
      return ssc;
   }
   public void setDoctorName(String doctorName) {
      this.doctorName = doctorName;
   public void setSsc(String ssc) {
      this.ssc = ssc;
   }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/PatientConsultEndpoint.java

@@ -443,6 +443,8 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			@RequestParam(value = "images",required = false) String images,
			@ApiParam(name = "voice", value = "语音")
			@RequestParam(value = "voice",required = false) String voice,
			@ApiParam(name = "relationCode", value = "关联业务表的code(服务项执行计划id)")
			@RequestParam(value = "relationCode",required = false) String relationCode,
			@ApiParam(name = "type", value = "咨询类型:1专家咨询 14导诊助手 17专家视频咨询 28康复咨询")
			@RequestParam(value = "type",required = false) Integer type,
			@ApiParam(name = "source", value = "咨询类型来源")
@@ -467,6 +469,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
		consult.setVoice(voice);
		consult.setDoctor(doctor);
		consult.setPatient(patient);
		consult.setRelationCode(relationCode);
		// 保存到数据库
//		int res = 0;
//		JSONArray dts = null;
@@ -508,7 +511,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			//发送系统消息
			SystemMessageDO systemMessageDO = new SystemMessageDO();
			systemMessageDO.setTitle("新增专家咨询");
			systemMessageDO.setTitle("新增"+re.getString("title"));
			systemMessageDO.setType("4");
			systemMessageDO.setReceiver(re.getString("doctor"));
			systemMessageDO.setReceiverName(re.getString("doctorName"));

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/statistics/EsStatisticsEndpoint.java

@@ -13,7 +13,6 @@ import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -1592,7 +1591,6 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
    }
    /**
     * 查询所有科室和医生
     * strJson={"type":"1","deptName":"心脏"}
@@ -1612,7 +1610,6 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
    }
    /**
     * 查询服务评价详情
     * strJson={"startDate":"2020-07-18","endDate":"2023-11-29","deptCode":"1110000","deptName":"梁敬兴","pageSwitch":"1","page":1,"pageSize":10}
@@ -1648,8 +1645,42 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
        }
    }
    /**
     * 调用i健康获取居民家庭成员关系信息列表
     */
    @GetMapping(value = "/getFamilyRelationByIjk")
    @ApiOperation(value = "获取居民家庭成员关系信息列表")
    public Envelop getFamilyRelationByIjk(@RequestParam(required = true) String strJson) {
        try {
            ScreenQvo qvo = JSON.parseObject(strJson, ScreenQvo.class);
            JSONObject result = statisticsEsService.getFamilyRelationByIjk(qvo);
            return success(result);
        } catch (Exception e) {
            e.printStackTrace();
            return failed("系统繁忙");
        }
    }
    /**
     * 调用i健康就诊情况
     */
    @GetMapping(value = "/getEventByIjk")
    @ApiOperation(value = "获取居民家庭成员关系信息列表")
    public Envelop getEventByIjk(@RequestParam(required = true) String strJson) {
        try {
            ScreenQvo qvo = JSON.parseObject(strJson, ScreenQvo.class);
            JSONObject result = statisticsEsService.getEventByIjk(qvo);
            return success(result);
        } catch (Exception e) {
            e.printStackTrace();
            return failed("系统繁忙");
        }
    }
    /**
     * 调用i健康查询体征信息
     */
}

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

@@ -256,10 +256,11 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
    @ApiOperation("查询居民的康复计划")
    public String getPatientRehabilitationByPatientId(
            @ApiParam(name = "patientId", value = "居民", required = false) @RequestParam(value = "patientId", required = false) String patientId,
            @ApiParam(name = "planId", value = "计划id", required = false) @RequestParam(value = "planId", required = false) String planId
            @ApiParam(name = "planId", value = "计划id", required = false) @RequestParam(value = "planId", required = false) String planId,
            @ApiParam(name = "diseaseId", value = "专病id", required = false) @RequestParam(value = "diseaseId", required = false) String diseaseId
    ) {
        try {
            List<Map<String, Object>> result = rehabilitationInfoService.getPatientRehabilitationByPatientId(patientId,planId);
            List<Map<String, Object>> result = rehabilitationInfoService.getPatientRehabilitationByPatientId(patientId,planId,diseaseId);
            return write(200, "请求成功", "data", result);
        } catch (Exception e) {
            e.printStackTrace();

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/RehabilitationInfoService.java

@@ -1,6 +1,5 @@
package com.yihu.jw.hospital.module.rehabilitation.service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
@@ -1232,7 +1231,7 @@ public class RehabilitationInfoService {
    /**
     * todo 还需要代办项目还需要重新join一张新表 todayTaskCount 今日任务项，等后面在整
     */
    public List<Map<String, Object>> getPatientRehabilitationByPatientId(String patientId, String planId) {
    public List<Map<String, Object>> getPatientRehabilitationByPatientId(String patientId, String planId,String diseaseId) {
        String sql = "SELECT DISTINCT \n" +
                "	 a.id,a.`name`,a.birthday,a.phone,a.sex,a.mobile,TIMESTAMPDIFF(YEAR,a.birthday,NOW()) 'age',a.idcard,\n" +
                "	 b.id 'planId',b.title 'planTitle',b.plan_doctor 'planDoctor',b.plan_doctor_name 'planDoctorName'" +
@@ -1264,8 +1263,10 @@ public class RehabilitationInfoService {
        if (StringUtils.isNotBlank(planId)) {
            sql += "	AND b.id='" + planId + "' ";
        }
        if(StringUtils.isNotBlank(diseaseId)){
            sql += "	AND d.id='" + diseaseId + "' ";
        }
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        System.out.println("数据：" + JSON.toJSONString(list));
        return list;
    }

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