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

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/PatientRehabilitationPlanDO.java

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationOperateRecordsDO.java

@@ -27,6 +27,8 @@ public class RehabilitationOperateRecordsDO extends UuidIdentityEntityWithOperat
    private Date completeTime;//服务完成时间
    private Integer status;//是否确认完成（0、未确认，1、已确认）
    private String node;//服务完成笔记
    private String relationCode;//业务id
    private String flag;//标记（1随访2临时随访）
    @Column(name = "saas_id")
    public String getSaasId() {
@@ -145,4 +147,21 @@ public class RehabilitationOperateRecordsDO extends UuidIdentityEntityWithOperat
        this.status = status;
    }
    @Column(name = "relation_code")
    public String getRelationCode() {
        return relationCode;
    }
    public void setRelationCode(String relationCode) {
        this.relationCode = relationCode;
    }
    @Column(name = "flag")
    public String getFlag() {
        return flag;
    }
    public void setFlag(String flag) {
        this.flag = flag;
    }
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/RehabilitationManageService.java

@@ -330,8 +330,7 @@ public class RehabilitationManageService {
     */
    public ObjEnvelop calendarPlanDetail(String executeStartTime,String executeEndTime,String planId,Integer searchTask,Integer status,String doctorCode) throws Exception{
        String sql = " select d.* from wlyy_specialist.wlyy_rehabilitation_plan_detail d " +
                " LEFT JOIN wlyy_specialist.wlyy_hospital_service_item h on d.hospital_service_item_id = h.id "+
                " LEFT JOIN wlyy_service_item i on i.id = h.service_item_id " +
                " LEFT JOIN wlyy_rehabilitation_service_item i on i.code = d.hospital_service_item_id " +
                " where  d.plan_id='"+planId+"' " ;
        if(StringUtils.isNotBlank(executeStartTime)){
            sql += " and d.execute_time>='"+executeStartTime+"' ";
@@ -340,12 +339,10 @@ public class RehabilitationManageService {
            sql += " and d.execute_time<='"+executeEndTime+"' ";
        }
        if(searchTask!=null){
            if(searchTask==1){
            if(searchTask==8){
                sql+=" and d.doctor='"+doctorCode+"' " ;
            }else if(searchTask==2||searchTask==4||searchTask==3){
                sql+=" and i.type="+searchTask+" " ;
            }else if(searchTask==5){
                sql+=" and i.reserve=1 " ;
            }else {
                sql+=" and i.code="+searchTask+" " ;
            }
        }
        if(status!=null){