| 
					
				 | 
			
			
				@ -512,7 +512,9 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                    @ApiParam(name = "prescriptionId", value = "处方id") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                        @RequestParam(value = "prescriptionId", required = false)String prescriptionId, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                    @ApiParam(name = "hisId", value = "审方唯一标识") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                        @RequestParam(value = "hisId", required = false)String hisId)throws Exception { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                        @RequestParam(value = "hisId", required = false)String hisId, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                    @ApiParam(name = "orderId", value = "上门服务订单号") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                        @RequestParam(value = "orderId", required = false)String orderId)throws Exception { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        Map<String,Object> result = prescriptionService.makeDiagnosis(outPatientId,prescriptionId,advice,type,infoJsons,diagnosisJson,inspectionJson,emrJson,hisId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -535,6 +537,10 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findOne(outPatientId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            String immsg = imService.pushHuiZhenMsg(msgObj,wlyyOutpatientDO.getDoctor(),wlyyOutpatientDO.getDoctorName(),outPatientId,wlyyOutpatientDO.getPatient(),wlyyOutpatientDO.getOutpatientType()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            System.out.println("发送诊断消息成功:"+immsg); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if (result.get("prescriptionId")!=null&&StringUtils.isNoneBlank(orderId)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              prescriptionService.savePrescriptionToDoorService(orderId,result.get("prescriptionId").toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        }catch (Exception e){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            System.out.println("发送诊断消息失败:"+e.getMessage()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				//            e.printStackTrace(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -2355,6 +2361,15 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @GetMapping(value = BaseHospitalRequestMapping.Prescription.doorServiceTest) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ApiOperation(value = "测试上门复诊数据同步") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public Envelop doorServiceTest( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            @ApiParam(name = "orderId", value = "orderId") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            @RequestParam(value = "orderId",defaultValue = "",required = false) String orderId, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            @ApiParam(name = "prId", value = "prId") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            @RequestParam(value = "prId",defaultValue = "",required = false) String prId) throws Exception { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        return success(prescriptionService.savePrescriptionToDoorService(orderId,prId)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				} 
			 |