Merge branch 'dev' of zd_123/patient-co-management into dev

patient-co/patient-co-figure-label/src/main/java/com/yihu/wlyy/figure/label/convert/SignIsOnlineConvert.java

@@ -12,8 +12,12 @@ import org.springframework.util.CollectionUtils;
import java.util.*;
/**
 * 适用于线上/线下的签约、缴费
 */
@Component
public class SignIsOnlineConvert implements Convert {
public class IsOnlineConvert implements Convert {
    @Override
    public List<SaveModel> convert(List<DataModel> models,List<FLlabelDict> flLabelDictList) {

patient-co/patient-co-figure-label/src/main/java/com/yihu/wlyy/figure/label/job/Mysql2ESJob.java

@@ -164,11 +164,15 @@ public class Mysql2ESJob implements Job {
            sqlFiledString.append(sqlFiled).append(sqlFiledCondition).append("\'"+sqlFiledValue+"\'");
        }
        if (sql.contains("where")) {
        if (sql.contains("where") &&  !sql.contains("$")) {
            result.append(" and ").append(sqlFiledString.toString());
        }else if (sql.contains("$")){
            StringBuffer otherCondition = new StringBuffer();
            otherCondition.append(" where ").append(sqlFiledString.toString());
            if (sql.contains("where")){
                otherCondition.append(" and ").append(sqlFiledString.toString());
            }else{
                otherCondition.append(" where ").append(sqlFiledString.toString());
            }
            result.replace(result.indexOf("$"),result.indexOf("$")+1,otherCondition.toString());
        }else {
            result.append(" where ").append(sqlFiledString.toString());