|  | @ -14604,24 +14604,24 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
 | 
	
		
			
				|  |  |             logger.info("获取患者待结算信息结束!");
 | 
	
		
			
				|  |  |             if(outpatientDO!=null&&outpatientDO.getMedicalState().equalsIgnoreCase("1")){
 | 
	
		
			
				|  |  |                 logger.info("医保挂号开始!");
 | 
	
		
			
				|  |  |                 String register = healthCareService.register(outpatientId);
 | 
	
		
			
				|  |  |                 String register = healthCareService.register(outpatientId,ylzMedicalRelationDO.getLogNo());
 | 
	
		
			
				|  |  |                 logger.info("医保挂号结束!");
 | 
	
		
			
				|  |  |                 logger.info("医保费用明细上传开始!");
 | 
	
		
			
				|  |  |                 String feeDetailUpload= healthCareService.feeDetailUpload(outpatientId);
 | 
	
		
			
				|  |  |                 String feeDetailUpload= healthCareService.feeDetailUpload(outpatientId,ylzMedicalRelationDO.getLogNo());
 | 
	
		
			
				|  |  |                 logger.info("医保费用明细上传结束!");
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |                 logger.info("医保预结算信息开始!");
 | 
	
		
			
				|  |  |                 ylzMedicalRelationDO =  healthCareService.preSettlement(outpatientId);
 | 
	
		
			
				|  |  |                 ylzMedicalRelationDO =  healthCareService.preSettlement(outpatientId,ylzMedicalRelationDO.getLogNo());
 | 
	
		
			
				|  |  |                 logger.info("医保预结算信息结束!");
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |                 if (flag==1){
 | 
	
		
			
				|  |  |                     logger.info("获取医保结算页面地址开始!");
 | 
	
		
			
				|  |  |                     String getSettlementResultUrl = healthCareService.getSettlementResultUrl(outpatientId);
 | 
	
		
			
				|  |  |                     String getSettlementResultUrl = healthCareService.getSettlementResultUrl(outpatientId,ylzMedicalRelationDO.getLogNo());
 | 
	
		
			
				|  |  |                     logger.info("获取医保结算页面地址结束!");
 | 
	
		
			
				|  |  |                     object.put("getSettlementResultUrl",getSettlementResultUrl);
 | 
	
		
			
				|  |  |                 }else if (flag==2){
 | 
	
		
			
				|  |  |                     logger.info("获取医保结算页面地址开始!");
 | 
	
		
			
				|  |  |                     String getSettlementResultUrlBase64 = healthCareService.getSettlementResultUrlBase64(outpatientId);
 | 
	
		
			
				|  |  |                     String getSettlementResultUrlBase64 = healthCareService.getSettlementResultUrlBase64(outpatientId,ylzMedicalRelationDO.getLogNo());
 | 
	
		
			
				|  |  |                     logger.info("获取医保结算页面地址结束!");
 | 
	
		
			
				|  |  |                     object.put("getSettlementResultUrlBase64",getSettlementResultUrlBase64);
 | 
	
		
			
				|  |  |                 }
 |