|  | @ -1,11 +1,13 @@
 | 
	
		
			
				|  |  | package com.yihu.jw.hospital.endpoint.prescription;
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
 | 
	
		
			
				|  |  | import com.yihu.jw.entity.hospital.message.SystemMessageDO;
 | 
	
		
			
				|  |  | import com.yihu.jw.entity.hospital.prescription.WlyyOutpatientDO;
 | 
	
		
			
				|  |  | import com.yihu.jw.hospital.prescription.service.InspectionService;
 | 
	
		
			
				|  |  | import com.yihu.jw.hospital.prescription.service.PrescriptionLogService;
 | 
	
		
			
				|  |  | import com.yihu.jw.hospital.prescription.service.PrescriptionService;
 | 
	
		
			
				|  |  | import com.yihu.jw.hospital.prescription.service.entrance.DoctorPreSignService;
 | 
	
		
			
				|  |  | import com.yihu.jw.hospital.service.SystemMessage.HospitalSystemMessageService;
 | 
	
		
			
				|  |  | import com.yihu.jw.im.service.ImService;
 | 
	
		
			
				|  |  | import com.yihu.jw.restmodel.base.dict.DictHospitalDeptVO;
 | 
	
		
			
				|  |  | import com.yihu.jw.restmodel.base.org.BaseOrgVO;
 | 
	
	
		
			
				|  | @ -60,6 +62,9 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
 | 
	
		
			
				|  |  |     @Autowired
 | 
	
		
			
				|  |  |     private DoctorPreSignService doctorPreSignService;
 | 
	
		
			
				|  |  |     
 | 
	
		
			
				|  |  |     @Autowired
 | 
	
		
			
				|  |  |     private HospitalSystemMessageService hospitalSystemMessageService;
 | 
	
		
			
				|  |  |     
 | 
	
		
			
				|  |  |     @Autowired
 | 
	
		
			
				|  |  |     private ImService imService;
 | 
	
		
			
				|  |  | 
 | 
	
	
		
			
				|  | @ -248,7 +253,15 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
 | 
	
		
			
				|  |  |                                          @RequestParam(value = "registerJson", required = false)String registerJson,
 | 
	
		
			
				|  |  |                                          @ApiParam(name = "chargeType", value = "预约实体json")
 | 
	
		
			
				|  |  |                                          @RequestParam(value = "chargeType", required = false)String chargeType)throws Exception {
 | 
	
		
			
				|  |  |         return success(BaseHospitalRequestMapping.Prescription.api_success,prescriptionService.appointmentRevisit(outpatientJson,expressageJson,registerJson,chargeType));
 | 
	
		
			
				|  |  |     
 | 
	
		
			
				|  |  |         WlyyOutpatientDO wlyyOutpatientDO = prescriptionService.appointmentRevisit(outpatientJson,expressageJson,registerJson,chargeType);
 | 
	
		
			
				|  |  |     
 | 
	
		
			
				|  |  |         //发送系统消息
 | 
	
		
			
				|  |  |         SystemMessageDO systemMessageDO = prescriptionService.sendOutPatientMes(wlyyOutpatientDO);
 | 
	
		
			
				|  |  |         //发送IM消息
 | 
	
		
			
				|  |  |         hospitalSystemMessageService.sendImMessage(systemMessageDO);
 | 
	
		
			
				|  |  |     
 | 
	
		
			
				|  |  |         return success(BaseHospitalRequestMapping.Prescription.api_success,wlyyOutpatientDO);
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @GetMapping(value = BaseHospitalRequestMapping.Prescription.getICD10)
 | 
	
	
		
			
				|  | @ -570,7 +583,14 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
 | 
	
		
			
				|  |  |                                             @RequestParam(value = "registerJson", required = false)String registerJson,
 | 
	
		
			
				|  |  |                                             @ApiParam(name = "chargeType", value = "号别")
 | 
	
		
			
				|  |  |                                             @RequestParam(value = "chargeType", required = false)String chargeType)throws Exception {
 | 
	
		
			
				|  |  |         return success(prescriptionService.cooperativeOutpatient(outpatientJson,registerJson,chargeType));
 | 
	
		
			
				|  |  |         WlyyOutpatientDO wlyyOutpatientDO = prescriptionService.cooperativeOutpatient(outpatientJson,registerJson,chargeType);
 | 
	
		
			
				|  |  |     
 | 
	
		
			
				|  |  |         //构建系统消息
 | 
	
		
			
				|  |  |         SystemMessageDO systemMessageDO = prescriptionService.sendOutPatientMes(wlyyOutpatientDO);
 | 
	
		
			
				|  |  |         //发送系统消息
 | 
	
		
			
				|  |  |         hospitalSystemMessageService.sendImMessage(systemMessageDO);
 | 
	
		
			
				|  |  |     
 | 
	
		
			
				|  |  |         return success(wlyyOutpatientDO);
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @PostMapping(value = BaseHospitalRequestMapping.Prescription.saveOutpatientDoctor)
 |