|  | @ -1,6 +1,8 @@
 | 
	
		
			
				|  |  | package com.yihu.jw.care.service.prescription;
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | import com.alibaba.fastjson.JSON;
 | 
	
		
			
				|  |  | import com.alibaba.fastjson.JSONObject;
 | 
	
		
			
				|  |  | import com.alibaba.fastjson.serializer.SerializerFeature;
 | 
	
		
			
				|  |  | import com.yihu.jw.care.dao.prescription.BaseCarePrescriptionDao;
 | 
	
		
			
				|  |  | import com.yihu.jw.doctor.dao.BaseDoctorDao;
 | 
	
		
			
				|  |  | import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
 | 
	
	
		
			
				|  | @ -96,6 +98,26 @@ public class BaseCarePrescriptionService {
 | 
	
		
			
				|  |  |         return result;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public JSONObject getPrescriptionInfo(String id,String patient){
 | 
	
		
			
				|  |  |         JSONObject result = new JSONObject();
 | 
	
		
			
				|  |  |         BaseCarePrescriptionDO prescriptionDO = null;
 | 
	
		
			
				|  |  |         if (StringUtils.isNotBlank(id)){
 | 
	
		
			
				|  |  |             prescriptionDO =  carePrescriptionDao.findOne(id);
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         else if (StringUtils.isNotBlank(patient)){
 | 
	
		
			
				|  |  |             prescriptionDO = carePrescriptionDao.selectOneByPatient(patient);
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (null==prescriptionDO){
 | 
	
		
			
				|  |  |             result.put(ResponseContant.resultFlag,ResponseContant.fail);
 | 
	
		
			
				|  |  |             result.put(ResponseContant.resultMsg,"续方记录不存在");
 | 
	
		
			
				|  |  |         }else {
 | 
	
		
			
				|  |  |             JSONObject objDo = JSONObject.parseObject(JSON.toJSONStringWithDateFormat(prescriptionDO,"yyyy-MM-dd HH:mm:ss", SerializerFeature.WriteMapNullValue));
 | 
	
		
			
				|  |  |             result.put(ResponseContant.resultFlag,ResponseContant.success);
 | 
	
		
			
				|  |  |             result.put(ResponseContant.resultMsg,objDo);
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         return result;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     /**
 | 
	
		
			
				|  |  |      * 居民端列表查询
 | 
	
		
			
				|  |  |      * @param patientId
 |