wangzhinan 11 mesi fa
parent
commit
3782de575c

+ 26 - 0
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/DsyyPrescriptionService.java

@ -1190,6 +1190,32 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
    }
    /**
     * 查询检验报告列表及详情
     * @return
     */
    public String selectTestReportList(String idcard,String cardNo,String startTime,String endTime,String reportId,Integer page,Integer size) throws Exception {
        String url = entranceUrl +"selectTestReportList";
        String object = "";
        Map<String,Object> params = new HashedMap();
        params.put("idcard",idcard);
        params.put("cardNo",cardNo);
        params.put("startTime",startTime);
        params.put("endTime",endTime);
        params.put("reportId",reportId);
        params.put("page",page);
        params.put("size",size);
        HttpResponse response = HttpUtils.doPost(url,params);
        String content = response.getContent();
        logger.info("response:"+content);
        JSONObject rs = JSON.parseObject(content);
        Integer status = rs.getInteger("status");
        if (status==200){
            object = rs.getString("detailModelList");
        }
        return object;
    }
    //=====================合理用药内网调用接口=======================

+ 10 - 12
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/DsyyEntranceService.java

@ -3081,16 +3081,16 @@ public class DsyyEntranceService {
    /**
     * 通用查询检验报告列表接口
     *
     * @param serverCode
     * @param
     * @return
     * @throws Exception
     */
    public JSONArray selectTestReportList(String serverCode,String idcard,String cardNo,String startTime,String endTime,String reportId,int page,int size) throws Exception {
        String url = "HTTP://10.95.8.41:51221";
    public JSONArray selectTestReportList(String idcard,String cardNo,String startTime,String endTime,String reportId,int page,int size) throws Exception {
        String url = "http://10.95.8.41:51221";
        JSONObject data = new JSONObject();
        JSONArray orders = new JSONArray();
        JSONArray condition = new JSONArray();
        data.put("serverCode",serverCode);
        data.put("serverCode","JHIDS-USD-hlwcxjysju017-018");
        data.put("sysCode","HLW");
        data.put("pageSize",size);
        data.put("pageNo",page);
@ -3100,31 +3100,36 @@ public class DsyyEntranceService {
            item.put("column","idcard");
            item.put("type","eq");
            item.put("value",idcard);
            condition.add(item);
        }
        if (StringUtils.isNoneBlank(cardNo)){
            item.put("column","cardNo");
            item.put("type","eq");
            item.put("value",cardNo);
            condition.add(item);
        }
        if (StringUtils.isNoneBlank(startTime)){
            item.put("column","startTime");
            item.put("type","eq");
            item.put("value",startTime);
            condition.add(item);
        }
        if (StringUtils.isNoneBlank(endTime)){
            item.put("column","endTime");
            item.put("type","eq");
            item.put("value",endTime);
            condition.add(item);
        }
        if (StringUtils.isNoneBlank(reportId)){
            item.put("column","reportId");
            item.put("type","eq");
            item.put("value",reportId);
            condition.add(item);
        }
        data.put("condition",condition);
        String xml = data.toJSONString();
        logger.info("xml"+xml);
        String response = httpClientUtil.postHeadBodyText(url,xml);
        String response = httpClientUtil.postHeadBodyText2(url,xml);
        logger.info("response===="+response);
        JSONArray jsonArray =new JSONArray();
        Object json = JSON.parse(response);
@ -3136,13 +3141,6 @@ public class DsyyEntranceService {
        } else if (json instanceof JSONArray) {
            JSONArray array = (JSONArray) json;
            array = JSONArray.parseArray(response);
            for (int i=0;i<array.size();i++){
                JSONObject object = array.getJSONObject(i);
                String EMRPDF=object.getString("EMRPDF");
                byte[] emrByte = Base64.decodeBase64(EMRPDF);
                String emrDecode = new String(emrByte, "GBK");
                object.put("EMRPDFHTMl", emrDecode);
            }
            jsonArray = array;
        }

+ 48 - 0
common/common-util/src/main/java/com/yihu/jw/util/http/HttpClientUtil.java

@ -7,6 +7,10 @@ import com.yihu.jw.entity.base.dict.BaseExceptionServerDictDO;
import com.yihu.jw.util.dao.BaseExceptionDictUtilDao;
import com.yihu.jw.util.dao.BaseExceptionLogUtilDao;
import com.yihu.jw.util.dao.BaseExceptionServerDictUtilDao;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import org.apache.http.*;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
@ -35,6 +39,7 @@ import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
import java.util.*;
import java.util.concurrent.TimeUnit;
@Component
@Transactional(propagation= Propagation.NOT_SUPPORTED)
@ -450,6 +455,49 @@ public class HttpClientUtil {
        return ret;
    }
    public  String postHeadBodyText3(String url, String params) throws IOException {
        OkHttpClient client = new OkHttpClient().newBuilder().build();
        okhttp3.MediaType mediaType  = okhttp3.MediaType.parse("text/plain");
        RequestBody body = RequestBody.create(mediaType,params);
        Request request= new Request.Builder().url("http://10.95.8.41:51221").method("POST",body).addHeader("grant_type","client_credentials").addHeader("client_id","HLW").addHeader("client_secret","123456").addHeader("Content-Type","text/plain").build();
        Response response = client.newCall(request).execute();
        System.out.println(response);
        return response.toString();
    }
    public  String postHeadBodyText2(String url, String params) {
        OkHttpClient client = new OkHttpClient().newBuilder()
                .connectTimeout(600, TimeUnit.SECONDS)//读取超时时间
                .readTimeout(600, TimeUnit.SECONDS)//写入超时时间
                .writeTimeout(600, TimeUnit.SECONDS).build();
        okhttp3.MediaType mediaType =okhttp3.MediaType.parse("text/plain");
        RequestBody body =RequestBody.create(mediaType,params);
        System.out.println("000000000000000000000000000000"+body);
        Request request = new Request.Builder()
                .url(url)
                .method("POST",body)
                .addHeader("Content-Length",String.valueOf(params.getBytes().length))
                .addHeader("grant_type","client_credentials")
                .addHeader("client_id","HLW")
                .addHeader("client_secret","123456")
                .addHeader("Content-Type","text/plain")
                .build();
        try(Response response = client.newCall(request).execute()) {
            System.out.println("1111111111111111111"+response);
            if (response.isSuccessful()) {
                String responseBody = response.body().string();
                System.out.println(responseBody);
                return responseBody;
            } else {
                System.out.println("GET request failed, code: " + response.code());
            }
        }catch (Exception e){
            e.printStackTrace();
        }
        return null;
    }
    public  static String postBodyStatic(String url, com.alibaba.fastjson.JSONObject params) {
        RestTemplate restTemplate = new RestTemplate();
        HttpHeaders headers = new HttpHeaders();

+ 2 - 4
svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/DsyyController.java

@ -602,9 +602,7 @@ public class DsyyController extends EnvelopRestEndpoint {
    @PostMapping(value = "/selectTestReportList")
    @ApiOperation(value = "查询检验接口")
    public ListEnvelop selectEmrInfoId(@ApiParam(name = "serverCode", value = "接口编码", required = false)
                                       @RequestParam(value = "serverCode",required = false)String serverCode,
                                       @ApiParam(name = "idcard", value = "患者身份证", required = false)
    public ListEnvelop selectEmrInfoId(@ApiParam(name = "idcard", value = "患者身份证", required = false)
                                       @RequestParam(value = "idcard",required = false)String idcard,
                                       @ApiParam(name = "cardNo", value = "卡号", required = false)
                                       @RequestParam(value = "cardNo",required = false)String cardNo,
@ -618,7 +616,7 @@ public class DsyyController extends EnvelopRestEndpoint {
                                           @RequestParam(value = "page",required = false)Integer page,
                                       @ApiParam(name = "size", value = "每页大小", required = false)
                                           @RequestParam(value = "size",required = false)Integer size) throws Exception {
        return success("请求成功",dsyyEntranceService.selectTestReportList(serverCode,idcard,cardNo,startTime,endTime,reportId,page,size));
        return success("请求成功",dsyyEntranceService.selectTestReportList(idcard,cardNo,startTime,endTime,reportId,page,size));
    }
    @PostMapping(value = "/selectEmrInfoIdJcpt")

+ 20 - 0
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@ -3915,5 +3915,25 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            return Envelop.getError(e.getMessage());
        }
    }
    @PostMapping(value = "/selectTestReportList")
    @ApiOperation(value = "查询检验接口")
    public ObjEnvelop selectEmrInfoId(@ApiParam(name = "idcard", value = "患者身份证", required = false)
                                       @RequestParam(value = "idcard",required = false)String idcard,
                                              @ApiParam(name = "cardNo", value = "卡号", required = false)
                                       @RequestParam(value = "cardNo",required = false)String cardNo,
                                              @ApiParam(name = "startTime", value = "开始时间", required = false)
                                       @RequestParam(value = "startTime",required = false)String startTime,
                                              @ApiParam(name = "endTime", value = "结束时间", required = false)
                                       @RequestParam(value = "endTime",required = false)String endTime,
                                              @ApiParam(name = "reportId", value = "报告id", required = false)
                                       @RequestParam(value = "reportId",required = false)String reportId,
                                              @ApiParam(name = "page", value = "页码", required = false)
                                       @RequestParam(value = "page",required = false)Integer page,
                                              @ApiParam(name = "size", value = "每页大小", required = false)
                                       @RequestParam(value = "size",required = false)Integer size) throws Exception {
        return success("请求成功",dsyyPrescriptionService.selectTestReportList(idcard,cardNo,startTime,endTime,reportId,page,size));
    }
}