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

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

@@ -1217,6 +1217,32 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
    }
    /**
     * 查询检验报告详情
     * @return
     */
    public String selectTestReportDetail(String idcard,String cardNo,String startTime,String endTime,String reportId,Integer page,Integer size) throws Exception {
        String url = entranceUrl +"selectTestReportDetail";
        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;
    }
    /**
     * 查询检查报告列表及详情
     * @return

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

@@ -3075,6 +3075,87 @@ public class DsyyEntranceService {
    /**
     * 检验报告列表接口
     *
     * @param
     * @return
     * @throws Exception
     */
    public JSONArray selectTestReportDetail(String idcard,String cardNo,String startTime,String endTime,String reportId,int page,int size) throws Exception {
        String url = "http://10.95.8.41:51225";
        JSONObject data = new JSONObject();
        JSONArray orders = new JSONArray();
        JSONArray condition = new JSONArray();
        data.put("serverCode","JHIDS-USD-hlwcxjysju017-018");
        data.put("sysCode","HLW");
        data.put("pageSize",size);
        data.put("pageNo",page);
        data.put("orders",orders);
        if (StringUtils.isNoneBlank(idcard)){
            JSONObject item = new JSONObject();
            item.put("column","idcard");
            item.put("type","eq");
            item.put("value",idcard);
            condition.add(item);
        }
        if (StringUtils.isNoneBlank(cardNo)){
            JSONObject item = new JSONObject();
            item.put("column","cardNo");
            item.put("type","eq");
            item.put("value",cardNo);
            condition.add(item);
        }
        if (StringUtils.isNoneBlank(startTime)){
            JSONObject item = new JSONObject();
            item.put("column","startTime");
            item.put("type","ge");
            item.put("value",startTime);
            condition.add(item);
        }
        if (StringUtils.isNoneBlank(endTime)){
            JSONObject item = new JSONObject();
            item.put("column","endTime");
            item.put("type","le");
            item.put("value",endTime);
            condition.add(item);
        }
        if (StringUtils.isNoneBlank(reportId)){
            JSONObject item = new JSONObject();
            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.postHeadBodyText2(url,xml);
        logger.info("response===="+response);
        JSONArray jsonArray =new JSONArray();
        Object json = JSON.parse(response);
        if (json instanceof JSONObject) {
            JSONObject jsonObject = (JSONObject) json;
            if (jsonObject.getString("code").equalsIgnoreCase("401")){
                throw new Exception(jsonObject.getString("message"));
            }
        } else if (json instanceof JSONArray) {
            JSONArray array = (JSONArray) json;
            array = JSONArray.parseArray(response);
            jsonArray = array;
        }
        WlyyHttpLogDO httpLogDO = new WlyyHttpLogDO();
        httpLogDO.setCode("JHIDS-USD-hlwcxjysju017-018");
        httpLogDO.setName("检验报告数据");
        httpLogDO.setRequest(xml);
        httpLogDO.setResponse(response);
        httpLogDO.setStatus("1");
        wlyyHttpLogDao.save(httpLogDO);
        return jsonArray;
    }
    /**
@@ -3089,7 +3170,7 @@ public class DsyyEntranceService {
        JSONObject data = new JSONObject();
        JSONArray orders = new JSONArray();
        JSONArray condition = new JSONArray();
        data.put("serverCode","JHIDS-USD-hlwcxjysju017-018");
        data.put("serverCode","JHIDS-USD-HLWJYJK19-017");
        data.put("sysCode","HLW");
        data.put("pageSize",size);
        data.put("pageNo",page);

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

@@ -604,9 +604,9 @@ public class DsyyController extends EnvelopRestEndpoint {
        return success("请求成功",dsyyEntranceService.selectReportInfo(serviceCode,patientId,visitNo,page,size));
    }
    @PostMapping(value = "/selectTestReportList")
    @PostMapping(value = "/selectTestReportDetail")
    @ApiOperation(value = "查询检验接口")
    public ListEnvelop selectEmrInfoId(@ApiParam(name = "idcard", value = "患者身份证", required = false)
    public ListEnvelop selectTestReportDetail(@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,
@@ -620,6 +620,25 @@ 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.selectTestReportDetail(idcard,cardNo,startTime,endTime,reportId,page,size));
    }
    @PostMapping(value = "/selectTestReportList")
    @ApiOperation(value = "查询检验接口")
    public ListEnvelop selectTestReportList(@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("请求成功",dsyyEntranceService.selectTestReportList(idcard,cardNo,startTime,endTime,reportId,page,size));
    }

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

@@ -3920,6 +3920,24 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        return success("请求成功",dsyyPrescriptionService.selectTestReportList(idcard,cardNo,startTime,endTime,reportId,page,size));
    }
    @PostMapping(value = "/selectTestReportDetail")
    @ApiOperation(value = "查询检验详情接口")
    public ObjEnvelop selectTestReportDetail(@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.selectTestReportDetail(idcard,cardNo,startTime,endTime,reportId,page,size));
    }
    @PostMapping(value = "/selectInspectReportList")
    @ApiOperation(value = "查询检查接口")
    public ObjEnvelop selectInspectReportList(@ApiParam(name = "idcard", value = "患者身份证", required = false)