| 
					
				 | 
			
			
				@ -1743,40 +1743,17 @@ public class PatientInfoService extends BaseService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     * @param keyWord 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     * @param deviceSn 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     * @param doctorId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     * @param isManage 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     * @param level   3区  2社区 1团队 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     * @param area 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     * @param pageNo 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     * @param pageSize 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     * @throws Exception 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public List<Map<String,Object>> getPatientSignByNameOrIdCard(String keyWord,String deviceSn,int isManage,int level,String area,int pageNo,int pageSize)throws Exception{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        /* String sql = "SELECT p.code,p.name,CASE p.sex WHEN 1 THEN '男' WHEN 2 THEN '女' END sex,p.idcard,f.doctor_name" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public List<Map<String,Object>> getPatientSignByNameOrIdCard(String keyWord,String deviceSn,String doctorId,int pageNo,int pageSize)throws Exception{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        Doctor doctor = doctorDao.findByCode(doctorId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String hospital = doctor.getHospital(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        int start = (pageNo-1)*pageSize; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        List<Map<String,Object>> patientList = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       /* String sql = "SELECT p.code,p.name,CASE p.sex WHEN 1 THEN '男' WHEN 2 THEN '女' END sex,p.idcard,f.doctor_name" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " FROM wlyy_patient p  LEFT JOIN wlyy_sign_family f ON p.code = f.patient" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " WHERE f.status = 1 AND p.name LIKE '%"+keyWord+"%' OR p.idcard LIKE '%"+keyWord+"%' and f.hospital = '"+hospital+"'"+" limit ?,?";*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String sql = ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        List<Map<String,Object>> patientList = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (isManage == 1 && level ==3){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            sql = "SELECT f.patient as code,f.name,f.idcard,f.doctor_name FROM wlyy_sign_family f where LEFT(f.hospital, 6) = '"+area+"'"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (isManage==0 || (isManage==1 && level == 2)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            sql = "SELECT f.patient as code,f.name,f.idcard,f.doctor_name FROM wlyy_sign_family f where f.hospital = '" + area + "' and f.status > 0 "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (!StringUtils.isEmpty(keyWord)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            sql += " AND f.name LIKE '%"+keyWord+"%' OR f.idcard LIKE '%"+keyWord+"%'"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        sql += " limit ?,?"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        int start = (pageNo-1)*pageSize; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String sql ="SELECT f.patient as code,f.name,f.idcard,f.doctor_name FROM wlyy_sign_family f where f.status > 0 AND f.hospital = '"+hospital+"' AND f.name LIKE '%"+keyWord+"%' OR f.idcard LIKE '%"+keyWord+"%' limit ?,?"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        patientList = jdbcTemplate.queryForList(sql ,new Object[]{start,pageSize}); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        //判断是否有绑定过该设备的人 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String patientDeviceSql = "SELECT user as patientCode FROM wlyy_patient_device WHERE device_sn='"+deviceSn+"'"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        List<Map<String,Object>> patientDeviceList = jdbcTemplate.queryForList(patientDeviceSql); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        for (Map<String,Object> map : patientList){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1784,9 +1761,9 @@ public class PatientInfoService extends BaseService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            map.put("sex",Constant.getLevelSexName(IdCardUtil.getSexForIdcard_new(String.valueOf(map.get("idcard"))))); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            for (Map<String,Object> patientDeviceMap : patientDeviceList){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                if (String.valueOf(map.get("code")).equals(String.valueOf(patientDeviceMap.get("patientCode")))){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    map.put("del",1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    map.put("del",0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    map.put("del",1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 |