| 
					
				 | 
			
			
				@ -11756,6 +11756,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    if ("0".equalsIgnoreCase(returnCode)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        returnMap.put("msg",object.getString("data")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        returnMap.put("status","-1"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        tasyNatService.cancleOrder(cardNo,HisSeqNo,orderNum); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        return  returnMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        flag = true; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -12263,13 +12264,29 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        if (StringUtils.isNoneBlank(baseNatAppointmentDO.getRealOrder())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            logger.info("同步his订单状态"+baseNatAppointmentDO.getRealOrder()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            //取消号源 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            tasyNatService.cancleOrder(baseNatAppointmentDO.getCardNo(),baseNatAppointmentDO.getRegisterNo(),baseNatAppointmentDO.getOderNum()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            tasyNatService.cancelNat(baseNatAppointmentDO.getRealOrder(),baseNatAppointmentDO.getMedicare(),baseNatAppointmentDO.getName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            baseNatAppointmentDO.setIsSuccess("-1"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            baseNatAppointmentDO.setCancelReson("患者本人取消"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            baseNatAppointmentDO.setCancelTime(new Date()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            baseNatAppointmentDO.setCancelBy(patientId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            baseNatAppointmentDao.save(baseNatAppointmentDO); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            String registerCancel =tasyNatService.cancleOrder(baseNatAppointmentDO.getCardNo(),baseNatAppointmentDO.getRegisterNo(),baseNatAppointmentDO.getOderNum()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(registerCancel); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            String isSuccess=jsonObject.getString("success"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            String natCancel=tasyNatService.cancelNat(baseNatAppointmentDO.getRealOrder(),baseNatAppointmentDO.getMedicare(),baseNatAppointmentDO.getName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            com.alibaba.fastjson.JSONObject jsonObject1 = JSON.parseObject(natCancel); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            String returnCode=jsonObject1.getString("ReturnCode"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            if ("1".equalsIgnoreCase(returnCode)&&"true".equalsIgnoreCase(isSuccess)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                System.out.println("11111"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                baseNatAppointmentDO.setIsSuccess("-1"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                baseNatAppointmentDO.setCancelReson("患者本人取消"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                baseNatAppointmentDO.setCancelTime(new Date()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                baseNatAppointmentDO.setCancelBy(patientId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                baseNatAppointmentDao.save(baseNatAppointmentDO); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                res="success"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            /*String backMsg=""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            if ("0".equalsIgnoreCase(returnCode)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                backMsg+=jsonObject1.getString("ReturnMsg"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            if (!"true".equalsIgnoreCase(isSuccess)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                String data=jsonObject1.getString("data"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                backMsg+=jsonObject1.getString("ReturnMsg"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            }*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 |