Merge branch 'dev' of huangwenjie/patient-co-management into dev

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/controller/PrescriptionController.java

@@ -206,6 +206,20 @@ public class PrescriptionController extends BaseController{
		}
	}
	@RequestMapping(value = "fadeRecipe",method = RequestMethod.POST)
	@ApiOperation("挂号作废处方接口")
	public Result fadeRecipe(@ApiParam(name="json",value="json",defaultValue = "{}")
								 @RequestParam(value = "json",required = true) String json){
		try {
			String re = prescriptionService.fadeRecipe(JSONObject.fromObject(json),null,null);
			return Result.success("挂号作废处方接口！",re);
		} catch (Exception ex) {
			ex.printStackTrace();
			return Result.error(ex.getMessage());
		}
	}
	/************************************ CA认证 ************************************************************/
	@RequestMapping(value = "RequestRealNameSoftCertAndSign",method = RequestMethod.POST)
	@ResponseBody

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/prescription/PrescriptionService.java

@@ -495,6 +495,28 @@ public class PrescriptionService extends ZysoftBaseService{
        return response;
    }
    /**
     * 挂号作废处方接口
     * @param json
     * @param hospital
     * @param licence @return
     */
    public String fadeRecipe(JSONObject json, String hospital, String licence) throws Exception{
        if(hospital==null){
            String[] hospitalMapping = getHospitalMapping(null); //获取机构映射
            hospital = hospitalMapping[0];
            licence = hospitalMapping[1];
        }
        Map<String,String> header = new HashMap<>();
        header.put("ORGCODE",hospital);
        header.put("LICENCE",licence);
        String response = postSecond("fadeRecipe","挂号作废处方接口",null,json,header,false,2);
        return response;
    }
    /*********************************************请求智业接口数据 end**************************************************/

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jw/JwPrescriptionService.java

@@ -128,5 +128,23 @@ public class JwPrescriptionService {
        return response;
    }
    /**
     * 挂号作废处方接口
     * @param visitNo 挂号号
     * @param fadeDept 作废科室编码
     * @param fadeOperator 作废人员编码
     * @return
     * @throws Exception
     */
    public String fadeRecipe(String visitNo,String fadeDept,String fadeOperator)throws Exception{
        String url = jwUrl + "/third/prescription/fadeRecipe";
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("visitNo", visitNo));//挂号号
        params.add(new BasicNameValuePair("fadeDept", fadeDept));//作废科室编码
        params.add(new BasicNameValuePair("fadeOperator", fadeOperator));//作废人员编码
        String response = httpClientUtil.post(url, params, "UTF-8");
        return response;
    }
}