代码修改

business/base-service/src/main/java/com/yihu/jw/healthCare/service/HealthCareService.java

@@ -307,8 +307,8 @@ public class HealthCareService {
            JSONObject data;
            //获取his处方信息
            String getRecipeInfoUrl = entranceUrl + "getRecipeInfo?icCardNo="+icCardNo+"&his_serial="+his_serial+"&org_code="+org_code;
            String infoResponse = httpClientUtil.get(getRecipeInfoUrl,"GBK");
            String presUploadUrl = entranceUrl + "presUpload?icCardNo="+icCardNo+"&his_serial="+his_serial+"&org_code="+org_code;
            String infoResponse = httpClientUtil.get(presUploadUrl,"GBK");
            logger.info("处方infoResponse:"+infoResponse);
            JSONObject infoObject = JSONObject.parseObject(infoResponse);
            if (infoObject.getString("status").equalsIgnoreCase("200")) {
@@ -369,8 +369,8 @@ public class HealthCareService {
        JSONObject data;
        //获取his处方信息
        String getRecipeInfoUrl = entranceUrl + "getRecipeInfo?icCardNo="+icCardNo+"&his_serial="+his_serial+"&org_code="+org_code;
        String infoResponse = httpClientUtil.get(getRecipeInfoUrl,"GBK");
        String presUploadUrl = entranceUrl + "presUpload?icCardNo="+icCardNo+"&his_serial="+his_serial+"&org_code="+org_code;
        String infoResponse = httpClientUtil.get(presUploadUrl,"GBK");
        logger.info("处方infoResponse:"+infoResponse);
        JSONObject infoObject = JSONObject.parseObject(infoResponse);
        if (infoObject.getString("status").equalsIgnoreCase("200")) {

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

@@ -2616,7 +2616,7 @@ public class XzzxEntranceService{
     * 2.1.3	获取处方信息
     * @return
     */
    public String getRecipeInfo(String icCardNo,String his_serial,String org_code)throws Exception{
    public String presUpload(String icCardNo,String his_serial,String org_code)throws Exception{
        String api = "presUpload";
        String msgHeader ="<?xml version=\"1.0\" encoding=\"utf-8\"?> " +
                "<root> " +
@@ -2652,9 +2652,9 @@ public class XzzxEntranceService{
        Map<String,String> params = new HashedMap();
        params.put("msgHeader",msgHeader);
        params.put("msgBody",msgBody);
        logger.info("getRecipeInfo params:"+params.toString());
        logger.info("presUpload params:"+params.toString());
        String xml = getXzzxWebServiceInfo("CallInterface",params,getOperateUrl());
        logger.info("getRecipeInfo json:"+xml);
        logger.info("presUpload json:"+xml);
        return xml;
    }

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

@@ -223,15 +223,15 @@ public class XzzxCotroller extends EnvelopRestEndpoint {
     * @return
     * @throws Exception
     */
    @GetMapping(value = "/getRecipeInfo")
    @GetMapping(value = "/presUpload")
    @ApiOperation(value = "获取处方信息", notes = "获取处方信息")
    public ObjEnvelop getRecipeInfo(@ApiParam(name = "icCardNo", value = "社保卡号", required = true)
    public ObjEnvelop presUpload(@ApiParam(name = "icCardNo", value = "社保卡号", required = true)
                                            @RequestParam(value = "icCardNo",required = true)String icCardNo,
                                            @ApiParam(name = "his_serial", value = "his挂号号", required = true)
                                            @RequestParam(value = "his_serial",required = true)String his_serial,
                                            @ApiParam(name = "org_code", value = "医院编码", required = true)
                                            @RequestParam(value = "org_code",required = true)String org_code)throws Exception{
        return ObjEnvelop.getSuccess("ok",xzzxEntranceService.getRecipeInfo(icCardNo,his_serial,org_code));
        return ObjEnvelop.getSuccess("ok",xzzxEntranceService.presUpload(icCardNo,his_serial,org_code));
    }
    /**