|  | @ -108,11 +108,21 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
 | 
	
		
			
				|  |  |     public JSONObject findPatientById(String patientId,String isCapacity) throws Exception{
 | 
	
		
			
				|  |  |         JSONObject res = new JSONObject();
 | 
	
		
			
				|  |  |         BasePatientDO patientDO = patientDao.findById(patientId);
 | 
	
		
			
				|  |  |         patientDO.setArchiveStatusName(dictService.fingByNameAndCode(ConstantUtil.DICT_ARCHIVESTATUS,String.valueOf(patientDO.getArchiveStatus())));
 | 
	
		
			
				|  |  |         patientDO.setNationalName(dictService.fingByNameAndCode(ConstantUtil.DICT_NATIONAL,String.valueOf(patientDO.getNational())));
 | 
	
		
			
				|  |  |         patientDO.setArchiveTypeName(dictService.fingByNameAndCode(ConstantUtil.DICT_ARCHIVETYPE,String.valueOf(patientDO.getArchiveType())));
 | 
	
		
			
				|  |  |         patientDO.setBloodName(dictService.fingByNameAndCode(ConstantUtil.DICT_BLOOD,String.valueOf(patientDO.getBlood())));
 | 
	
		
			
				|  |  |         patientDO.setMarriageName(dictService.fingByNameAndCode(ConstantUtil.DICT_MARRIAGE_STATUS,String.valueOf(patientDO.getMarriage())));
 | 
	
		
			
				|  |  |         if (patientDO.getArchiveStatus()!=null){
 | 
	
		
			
				|  |  |             patientDO.setArchiveStatusName(dictService.fingByNameAndCode(ConstantUtil.DICT_ARCHIVESTATUS,String.valueOf(patientDO.getArchiveStatus())));
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (patientDO.getNational()!=null){
 | 
	
		
			
				|  |  |             patientDO.setNationalName(dictService.fingByNameAndCode(ConstantUtil.DICT_NATIONAL,String.valueOf(patientDO.getNational())));
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (patientDO.getArchiveType()!=null){
 | 
	
		
			
				|  |  |             patientDO.setArchiveTypeName(dictService.fingByNameAndCode(ConstantUtil.DICT_ARCHIVETYPE,String.valueOf(patientDO.getArchiveType())));
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (patientDO.getBlood()!=null){
 | 
	
		
			
				|  |  |             patientDO.setBloodName(dictService.fingByNameAndCode(ConstantUtil.DICT_BLOOD,String.valueOf(patientDO.getBlood())));
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (patientDO.getMarriage()!=null){
 | 
	
		
			
				|  |  |             patientDO.setMarriageName(dictService.fingByNameAndCode(ConstantUtil.DICT_MARRIAGE_STATUS,String.valueOf(patientDO.getMarriage())));
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         res.put("patient",patientDO);
 | 
	
		
			
				|  |  | 
 |