代码修改

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotPatientDeviceService.java

@@ -296,18 +296,12 @@ public class IotPatientDeviceService extends BaseJpaService<IotPatientDeviceDO,
                String snCoed = locationDataVO.getDeviceSn();
                List<Map<String,Object>> nameList = new ArrayList<>();
                List<Map<String,Object>> deviceList = new ArrayList<>();
                System.out.println("idCard:="+idCard);
                System.out.println("snCode:="+snCoed);
                if (StringUtils.isNotEmpty(idCard)){
                    sql = sql +" and t.idcard = '"+idCard+"'";
                    System.out.println("查询患者name和code开始");
                    nameList = jdbcTempalte.queryForList(sql);
                    System.out.println("查询患者name和code结束:"+nameList);
                }if (StringUtils.isNotEmpty(snCoed)){
                    sqlEqt = sqlEqt +" and t.device_code = '"+snCoed+"'";
                    System.out.println("查询设备名称开始");
                    deviceList = jdbcTempalte.queryForList(sqlEqt);
                    System.out.println("查询设备名称结束:"+deviceList);
                }
                if(nameList.size()>0){
                    String code = null==nameList.get(0).get("code")?"":nameList.get(0).get("code").toString();

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/SpecialistService.java

@@ -610,13 +610,13 @@ public class SpecialistService{
                " r.team_code,r.sign_date , " +
                " t.`name` AS name," +
                " d.photo," +
                " d.code AS doctor," +
                " d.name AS doctorName,d.hospital,d.hospital_name " +
                " md.code AS doctor," +
                " md.name AS doctorName,d.hospital,d.hospital_name " +
                " FROM " +
                " wlyy_specialist_patient_relation r  " +
                " JOIN "+basedb+".wlyy_admin_team t ON t.id = r.team_code " +
                " JOIN "+basedb+".wlyy_doctor d ON t.leader_code = d.`code` " +
//                " JOIN "+basedb+".wlyy_doctor md ON md.code = r.doctor " +
                " JOIN "+basedb+".wlyy_doctor md ON md.code = r.doctor " +
                " WHERE " +
                " r.patient = '"+patient+"' " +
                " AND r.`status` >=0  " +