Home Explore Help
Register Sign In
Amoy2
/
wlyy2.0
Watch 5
Star 1
Fork 18
Files Issues 0 Pull Requests 0 Wiki
Browse Source

解决冲突

wujunjie 7 years ago
parent
6445c72b81
commit
27ec81042b
1 changed files with 18 additions and 0 deletions
Unified View Show Diff Stats
  1. 18 0
      patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/followup/FollowUpService.java

+ 18 - 0
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/followup/FollowUpService.java
View File 

@ -27,11 +27,18 @@ import com.yihu.wlyy.service.system.SystemDictService;
 
import com.yihu.wlyy.task.PushMsgTask;
 
import com.yihu.wlyy.task.PushMsgTask;
 
import com.yihu.wlyy.util.DateUtil;
 
import com.yihu.wlyy.util.DateUtil;
 
import com.yihu.wlyy.util.HttpClientUtil;
 
import com.yihu.wlyy.util.HttpClientUtil;
 
import io.searchbox.client.JestClient;
 
import io.searchbox.core.*;
 
import org.apache.commons.lang3.StringUtils;
 
import org.apache.commons.lang3.StringUtils;
 
import org.apache.http.NameValuePair;
 
import org.apache.http.NameValuePair;
 
import org.apache.http.message.BasicNameValuePair;
 
import org.apache.http.message.BasicNameValuePair;
 
import org.elasticsearch.index.query.BoolQueryBuilder;
 
import org.elasticsearch.index.query.QueryBuilders;
 
import org.elasticsearch.search.builder.SearchSourceBuilder;
 
import org.json.JSONArray;
 
import org.json.JSONArray;
 
import org.json.JSONObject;
 
import org.json.JSONObject;
 
import org.slf4j.Logger;
 
import org.slf4j.LoggerFactory;
 
import org.springframework.beans.factory.annotation.Autowired;
 
import org.springframework.beans.factory.annotation.Autowired;
 
import org.springframework.beans.factory.annotation.Value;
 
import org.springframework.beans.factory.annotation.Value;
 
import org.springframework.data.domain.Page;
 
import org.springframework.data.domain.Page;
 
@ -40,6 +47,7 @@ import org.springframework.data.domain.Pageable;
 
import org.springframework.data.domain.Sort;
 
import org.springframework.data.domain.Sort;
 
import org.springframework.jdbc.core.JdbcTemplate;
 
import org.springframework.jdbc.core.JdbcTemplate;
 
import org.springframework.stereotype.Component;
 
import org.springframework.stereotype.Component;
 
import com.alibaba.fastjson.JSON;
 
import javax.transaction.Transactional;
 
import javax.transaction.Transactional;
 
import java.text.SimpleDateFormat;
 
import java.text.SimpleDateFormat;
 
@ -54,6 +62,8 @@ import java.util.*;
 
@Transactional(rollbackOn = Exception.class)
 
@Transactional(rollbackOn = Exception.class)
 
public class FollowUpService extends BaseService {
 
public class FollowUpService extends BaseService {
 
    private static Logger logger = LoggerFactory.getLogger(FollowUpService.class);
 
    @Autowired
 
    @Autowired
 
    private DoctorDao doctorDao;
 
    private DoctorDao doctorDao;
 
@ -99,6 +109,14 @@ public class FollowUpService extends BaseService {
 
    private String targetUrl;
 
    private String targetUrl;
 
    @Autowired
 
    @Autowired
 
    private HttpClientUtil httpClientUtil;
 
    private HttpClientUtil httpClientUtil;
 
    @Value("${es.type.FollowUpContent}")
 
    private String esType;
 
    @Value("${es.index.FollowUp}")
 
    private String esIndex;
 
    @Autowired
 
    private ElasticFactory elasticFactory;
 
    @Autowired
 
    private ElastricSearchSave elastricSearchSave;
 
    /**
 
    /**