Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -969,8 +969,9 @@ public class ConsultTeamService extends ConsultService {
//            if("0".equals(checkPre)){//存在未结算的续方
//                return -3;
//            }
            Doctor doctor = doctorDao.findByCode(doctorCode);
            ct.setAdminTeamId(signFamily.getAdminTeamId());
            Doctor doctor = doctorDao.findByAdminTeamId(signFamily.getAdminTeamId());
            doctorCode = doctor.getCode();
            // 查询患者信息
            Patient p = patientDao.findByCode(patient);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/system/SystemDictService.java

@@ -45,6 +45,12 @@ public class SystemDictService {
                String exit = redisTemplate.opsForValue().get("systemDict:" + dictName);
                if (!StringUtils.isEmpty(exit)) {
                    re = redisTemplate.opsForValue().get("systemDict:" + dictName + ":" + code);
                    if(StringUtils.isEmpty(re)){
                        re = systemDictDao.findByDictNameAndCode(dictName,code);
                        if (StringUtils.isEmpty(re)) {
                            redisTemplate.opsForValue().set("systemDict:" + dictName + ":" + code, re);
                        }
                    }
                } else {
                    List<SystemDict> list = systemDictDao.findByDictName(dictName);
                    if (list != null && list.size() > 0) {