Merge branch 'dev' of huangwenjie/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/healthedu/HealthEduService.java

@@ -12,10 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
 * 健康教育业务层代码
@@ -41,11 +38,19 @@ public class HealthEduService {
		
		Map<String,String> orgcodemap = new HashMap<>();
		
		Set<String> patientcodesets = new HashSet<>();
		
		String sql = "SELECT patientCode FROM "+esType+" where createTime >='"+beginDate+"T00:00:00+0800' and createTime <='"+endDate+"T23:59:59+0800'  group by patientCode limit 0,1000000";
		
		List<HealthEduPatientCode> patientCodes = elasticsearchUtil.excute(sql, HealthEduPatientCode.class, esIndex, esType);
		
		for (HealthEduPatientCode es: patientCodes) {
			System.out.println(patientcodesets.size());
			if(patientcodesets.contains(es.getPatientCode())){
				continue;
			}else{
				patientcodesets.add(es.getPatientCode());
			}
			SignFamily obj = familyContractService.findSignByPatient(es.getPatientCode());
			if( obj == null){
				continue;
@@ -53,6 +58,9 @@ public class HealthEduService {
			String jworgcode = "";
			if(orgcodemap.isEmpty() || !orgcodemap.keySet().contains(obj.getHospital())){
				HospitalMapping hospitalMapping =  hospitalMappingDao.findByCode(obj.getHospital());
				if(hospitalMapping == null){
					continue;
				}
				jworgcode = hospitalMapping.getMappingCode();
				orgcodemap.put(obj.getHospital(),jworgcode);
			}else{

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/user/UserService.java

@@ -196,8 +196,8 @@ public class UserService extends BaseJpaService<User,UserDao> {
            String[] codes = code.split(",");
            List<ManageDictEntry> manageDictEntries = manageDictEntryDao.findByDictIdAndCodes(dictId, codes);
            if (null != manageDictEntries && manageDictEntries.size() > 0) {
//                return manageDictEntries.get(0).getValue();
                return "http://localhost:8180/admin/main";
                return manageDictEntries.get(0).getValue();
//                return "http://localhost:8180/admin/main";
            }
        }
        return null;