bug修改

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

@@ -32,10 +32,29 @@ public class ScreenQvo {
    private int pageSize;
    private String pageSwitch;//1是0否  分页开关
    private String type;//类型
    private String idcard;
    private String ssc;//社保卡号
    private String time;//时间（一周，一月，半年）
    private String idcard;
    private String name;
    private String mobile;
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    public String getTime() {
        return time;
    }

starter/elasticsearch-starter/src/main/java/com/yihu/jw/elasticsearch/ElasticSearch7Pool.java

@@ -69,6 +69,7 @@ public class ElasticSearch7Pool {
        //设置密码
        final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
        credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(userName, password));
        System.out.println("hosts==>" + JSON.toJSONString(hosts) + "  userName==>" + userName + " password==>" + password);
        //设置超时
        RestClientBuilder builder = RestClient.builder(httpHosts).setRequestConfigCallback(new RestClientBuilder.RequestConfigCallback() {
            @Override
@@ -94,8 +95,7 @@ public class ElasticSearch7Pool {
    public ResultSet restHighLevelClientStream(String sql) throws Exception {
//        Connection connection = DriverManager.getConnection("jdbc:es://http://172.26.0.55:9200","elastic","elastic");
//        Connection connection = DriverManager.getConnection("jdbc:es://http://172.26.0.168:9200/","elastic","elastic");
        System.out.println("连接地址==>hosts:"+hosts);
        System.out.println("es账号密码==>userName:"+userName+"   -------------  password:"+password);
        System.out.println("连接地址==>hosts:" + hosts + " es账号密码==>userName:" + userName + "   -------------  password:" + password);
        Connection connection = DriverManager.getConnection("jdbc:es://" + hosts, userName, password);
        Statement statement = connection.createStatement();
        ResultSet resultSet = statement.executeQuery(sql);

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

@@ -1747,26 +1747,16 @@ class EsStatisticsEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseHospitalRequestMapping.DodtorIM.records2)
    @ApiOperation(value = "医生咨询记录查询")
    public Envelop records2(
            @ApiParam(name = "doctor", value = "医生id")
            @RequestParam(value = "doctor", required = false) String doctor,
            @ApiParam(name = "title", value = "咨询标题关键字")
            @RequestParam(value = "title", required = false) String title,
            @ApiParam(name = "patient", value = "患者id")
            @RequestParam(value = "patient", required = false) String patient,
            @ApiParam(name = "id", value = "咨询ID")
            @RequestParam(value = "id", required = false) String id,
            @ApiParam(name = "type", value = "咨询类型")
            @RequestParam(value = "type", required = true) String type,
            @ApiParam(name = "status", value = "咨询状态：0全部，1候诊中，2就诊中，3结束")
            @RequestParam(value = "status", required = true) Integer status,
            @ApiParam(name = "start_time", value = "开始时间 YYYY-MM-DD HH:MM:SS")
            @RequestParam(value = "start_time", required = false) String start_time,
            @ApiParam(name = "end_time", value = "结束时间 YYYY-MM-DD HH:MM:SS")
            @RequestParam(value = "end_time", required = false) String end_time,
            @ApiParam(name = "page", value = "第几页")
            @RequestParam(value = "page", required = false) int page,
            @ApiParam(name = "pagesize", value = "分页大小")
            @RequestParam(value = "pagesize", required = false) int pagesize
            @ApiParam(name = "doctor", value = "医生id") @RequestParam(value = "doctor", required = false) String doctor,
            @ApiParam(name = "title", value = "咨询标题关键字") @RequestParam(value = "title", required = false) String title,
            @ApiParam(name = "patient", value = "患者id") @RequestParam(value = "patient", required = false) String patient,
            @ApiParam(name = "id", value = "咨询ID") @RequestParam(value = "id", required = false) String id,
            @ApiParam(name = "type", value = "咨询类型") @RequestParam(value = "type", required = true) String type,
            @ApiParam(name = "status", value = "咨询状态：0全部，1候诊中，2就诊中，3结束") @RequestParam(value = "status", required = true) Integer status,
            @ApiParam(name = "start_time", value = "开始时间 YYYY-MM-DD HH:MM:SS") @RequestParam(value = "start_time", required = false) String start_time,
            @ApiParam(name = "end_time", value = "结束时间 YYYY-MM-DD HH:MM:SS") @RequestParam(value = "end_time", required = false) String end_time,
            @ApiParam(name = "page", value = "第几页") @RequestParam(value = "page", required = false) int page,
            @ApiParam(name = "pagesize", value = "分页大小") @RequestParam(value = "pagesize", required = false) int pagesize
    ) throws Exception {
        try {
            List<Map<String, Object>> data = imService.findConsultRecordByDoctorNew(doctor, id, type, status, page, pagesize, title, start_time, end_time, patient);
@@ -1801,4 +1791,38 @@ class EsStatisticsEndpoint extends EnvelopRestEndpoint {
    }
    /**
     * 获取i健康的医生信息登录大屏
     */
    @GetMapping(value = "/getDoctorInfoByIjk")
    @ApiOperation(value = "获取i健康的医生信息登录大屏")
    public Envelop getDoctorInfoByIjk(@RequestParam(required = true) String strJson) {
        try {
            System.out.println("调用==>获取i健康的医生信息登录大屏---参数==>" + strJson);
            ScreenQvo qvo = JSON.parseObject(strJson, ScreenQvo.class);
            JSONObject result = statisticsEsService.getDoctorInfoByIjk(qvo);
            return success(result);
        } catch (Exception e) {
            e.printStackTrace();
            return failed("系统繁忙");
        }
    }
    /**
     * 获取三院大屏跳转i健康大屏的地址
     */
    @GetMapping(value = "/getScreamAddress")
    @ApiOperation(value = "获取三院大屏跳转i健康大屏的地址")
    public Envelop getScreamAddress() {
        try {
            System.out.println("调用==>获取三院大屏跳转i健康大屏的地址");
            Map<String, Object> result = statisticsEsService.getScreamAddress();
            return success(result);
        } catch (Exception e) {
            e.printStackTrace();
            return failed("系统繁忙");
        }
    }
}

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

@@ -38,10 +38,7 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Base64;
import java.util.Date;
import java.util.List;
import java.util.*;
/**
 * Created by liub on 2020/9/29.