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

@@ -354,13 +354,14 @@ public class PrescriptionController extends BaseController{
	/**---------------------顺丰快递相关接口---------------------**/
	@RequestMapping(value = "getSFExpressInfoByVisitNo",method = RequestMethod.GET)
	@RequestMapping(value = "getSFExpressInfoByVisitNoAndRecipeNo",method = RequestMethod.GET)
	@ResponseBody
	@ApiOperation("根据基卫挂号单获取顺丰快递相关信息")
	@ApiOperation("根据基卫挂号号和处方号获取顺丰快递相关信息")
	public Result getSFExpressInfo(
			@ApiParam(name="visitNo", value="基卫挂号号") @RequestParam(value = "visitNo",required = true) String visitNo){
			@ApiParam(name="visitNo", value="基卫挂号号") @RequestParam(value = "visitNo",required = true) String visitNo,
			@ApiParam(name="recipeNo", value="基卫处方号") @RequestParam(value = "recipeNo",required = true) String recipeNo){
		try {
			return prescriptionService.getSFExpressInfoByVisitNo(visitNo);
			return prescriptionService.getSFExpressInfoByVisitNoAndRecipeNo(visitNo,recipeNo);
		}catch (Exception e){
			e.printStackTrace();
			return Result.error(e.getMessage());

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

@@ -663,6 +663,7 @@ public class PrescriptionService extends ZysoftBaseService{
     * 7.5 查询处方结算结果列表
     * @param cardNo 病人卡号
     * @param visitNo 挂号号
     * @param recipeNo 处方号
     * @return
     * @throws Exception
     */
@@ -832,12 +833,13 @@ public class PrescriptionService extends ZysoftBaseService{
    /**
     * 根据基卫处方编码获取顺丰快递相关信息
     * @param visitNo
     * @param recipeNo
     * @return
     */
    public Result getSFExpressInfoByVisitNo(String visitNo) {
    public Result getSFExpressInfoByVisitNoAndRecipeNo(String visitNo, String recipeNo) {
        //根据基卫处方编号获取处方信息
        Prescription prescription = prescriptionDao.findByVisitNo(visitNo);
        Prescription prescription = prescriptionDao.findByVisitNoAndRecipeNo(visitNo,recipeNo);
        if(prescription == null){
            return Result.error(-1,"查询失败，未找到处方，挂号单为："+visitNo);