|
@ -766,17 +766,12 @@ public class PatientInfoPlatFormService {
|
|
" CAST(DATE_FORMAT(sort_date,'%Y-%m-%d %H:%i:%S') as char) sort_date, " +
|
|
" CAST(DATE_FORMAT(sort_date,'%Y-%m-%d %H:%i:%S') as char) sort_date, " +
|
|
" CAST(DATE_FORMAT(czrq,'%Y-%m-%d %H:%i:%S') as char) czrq from wlyy_patient_health_index " +
|
|
" CAST(DATE_FORMAT(czrq,'%Y-%m-%d %H:%i:%S') as char) czrq from wlyy_patient_health_index " +
|
|
" where device_sn='"+deviceSn+"' and del=1 ";
|
|
" where device_sn='"+deviceSn+"' and del=1 ";
|
|
pageSql =bl?" and record_date >= '"+beforeTime+"' and record_date <= '"+afterTime+"' ORDER BY sort_date DESC ": " ORDER BY sort_date DESC LIMIT 1 ";
|
|
|
|
|
|
pageSql =bl?" and record_date >= '"+beforeTime+"' and record_date <= '"+afterTime+"' ORDER BY sort_date DESC limit 1 ": " ORDER BY sort_date DESC LIMIT 1 ";
|
|
List<Map<String,Object>> sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
List<Map<String,Object>> sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
if (sqlResult.size()>0){
|
|
if (sqlResult.size()>0){
|
|
if(!bl){
|
|
|
|
detailInfo.put("healthIndex",sqlResult.get(0));
|
|
|
|
}else {
|
|
|
|
detailInfo.put("healthIndexList",sqlResult);
|
|
|
|
}
|
|
|
|
|
|
detailInfo.put("healthIndex",sqlResult.get(0));
|
|
}else {
|
|
}else {
|
|
detailInfo.put("healthIndex",null);
|
|
detailInfo.put("healthIndex",null);
|
|
detailInfo.put("healthIndexList",new ArrayList<>());
|
|
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case "2"://血压 最近一次收缩压,舒张压、在线状态
|
|
case "2"://血压 最近一次收缩压,舒张压、在线状态
|
|
@ -784,17 +779,12 @@ public class PatientInfoPlatFormService {
|
|
" CAST(DATE_FORMAT(sort_date,'%Y-%m-%d %H:%i:%S') as char) sort_date, " +
|
|
" CAST(DATE_FORMAT(sort_date,'%Y-%m-%d %H:%i:%S') as char) sort_date, " +
|
|
" CAST(DATE_FORMAT(czrq,'%Y-%m-%d %H:%i:%S') as char) czrq from wlyy_patient_health_index " +
|
|
" CAST(DATE_FORMAT(czrq,'%Y-%m-%d %H:%i:%S') as char) czrq from wlyy_patient_health_index " +
|
|
" where device_sn='"+deviceSn+"' and del=1 ";
|
|
" where device_sn='"+deviceSn+"' and del=1 ";
|
|
pageSql =bl?" and record_date >= '"+beforeTime+"' and record_date <= '"+afterTime+"' ORDER BY sort_date DESC ": " ORDER BY sort_date DESC LIMIT 1 ";
|
|
|
|
|
|
pageSql =bl?" and record_date >= '"+beforeTime+"' and record_date <= '"+afterTime+"' ORDER BY sort_date DESC limit 1 ": " ORDER BY sort_date DESC LIMIT 1 ";
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
if (sqlResult.size()>0){
|
|
if (sqlResult.size()>0){
|
|
if(!bl){
|
|
|
|
detailInfo.put("healthIndex",sqlResult.get(0));
|
|
|
|
}else {
|
|
|
|
detailInfo.put("healthIndexList",sqlResult);
|
|
|
|
}
|
|
|
|
|
|
detailInfo.put("healthIndex",sqlResult.get(0));
|
|
}else {
|
|
}else {
|
|
detailInfo.put("healthIndex",null);
|
|
detailInfo.put("healthIndex",null);
|
|
detailInfo.put("healthIndexList",new ArrayList<>());
|
|
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case "4"://手表 电量、佩戴状态、是否预警、在线状态
|
|
case "4"://手表 电量、佩戴状态、是否预警、在线状态
|
|
@ -816,16 +806,12 @@ public class PatientInfoPlatFormService {
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_security_monitoring_order o " +
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_security_monitoring_order o " +
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 " +
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 " +
|
|
" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' " +
|
|
" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' " +
|
|
" ORDER BY create_time desc ";
|
|
|
|
|
|
" ORDER BY create_time desc limit 1 ";
|
|
}
|
|
}
|
|
sqlResult = jdbcTemplate.queryForList(sql);
|
|
sqlResult = jdbcTemplate.queryForList(sql);
|
|
if (sqlResult.size()>0){
|
|
if (sqlResult.size()>0){
|
|
detailInfo.put("warnStatus",true);
|
|
detailInfo.put("warnStatus",true);
|
|
if(!bl){
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
|
|
}else {
|
|
|
|
detailInfo.put("orderInfo",sqlResult);
|
|
|
|
}
|
|
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
}else {
|
|
}else {
|
|
detailInfo.put("warnStatus",false);
|
|
detailInfo.put("warnStatus",false);
|
|
}
|
|
}
|
|
@ -854,30 +840,24 @@ public class PatientInfoPlatFormService {
|
|
//手表步数数据
|
|
//手表步数数据
|
|
sql = "select *,CAST(DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') as char) create_time " +
|
|
sql = "select *,CAST(DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') as char) create_time " +
|
|
" from base_patient_step where 1=1 and device_sn='"+deviceSn+"' ";
|
|
" from base_patient_step where 1=1 and device_sn='"+deviceSn+"' ";
|
|
pageSql =bl?" and create_time >= '"+beforeTime+"' and create_time <= '"+afterTime+"' order by create_time desc ": " order by create_time desc limit 1 ";
|
|
|
|
|
|
pageSql =bl?" and create_time >= '"+beforeTime+"' and create_time <= '"+afterTime+"' order by create_time desc limit 1 ": " order by create_time desc limit 1 ";
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
if (sqlResult.size()>0) {
|
|
if (sqlResult.size()>0) {
|
|
if(!bl){
|
|
|
|
detailInfo.put("steps",sqlResult.get(0));
|
|
|
|
}else {
|
|
|
|
detailInfo.put("stepsList",sqlResult);
|
|
|
|
}
|
|
|
|
|
|
detailInfo.put("steps",sqlResult.get(0));
|
|
}else {
|
|
}else {
|
|
detailInfo.put("steps","无步数数据");
|
|
detailInfo.put("steps","无步数数据");
|
|
detailInfo.put("stepsList",new ArrayList<>());
|
|
|
|
}
|
|
}
|
|
//手表心率数据
|
|
//手表心率数据
|
|
sql = " select *,CAST(DATE_FORMAT(record_date,'%Y-%m-%d %H:%i:%S') as char) record_date, " +
|
|
sql = " select *,CAST(DATE_FORMAT(record_date,'%Y-%m-%d %H:%i:%S') as char) record_date, " +
|
|
" CAST(DATE_FORMAT(sort_date,'%Y-%m-%d %H:%i:%S') as char) sort_date, " +
|
|
" CAST(DATE_FORMAT(sort_date,'%Y-%m-%d %H:%i:%S') as char) sort_date, " +
|
|
" CAST(DATE_FORMAT(czrq,'%Y-%m-%d %H:%i:%S') as char) czrq from wlyy_patient_health_index " +
|
|
" CAST(DATE_FORMAT(czrq,'%Y-%m-%d %H:%i:%S') as char) czrq from wlyy_patient_health_index " +
|
|
" where type=5 and device_sn='"+deviceSn+"' and del=1 ";
|
|
" where type=5 and device_sn='"+deviceSn+"' and del=1 ";
|
|
pageSql =bl?" and record_date >= '"+beforeTime+"' and record_date <= '"+afterTime+"' ORDER BY sort_date DESC ": " ORDER BY sort_date DESC LIMIT 1 ";
|
|
|
|
|
|
pageSql =bl?" and record_date >= '"+beforeTime+"' and record_date <= '"+afterTime+"' ORDER BY sort_date DESC limit 1 ": " ORDER BY sort_date DESC LIMIT 1 ";
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
if (sqlResult.size()>0){
|
|
if (sqlResult.size()>0){
|
|
detailInfo.put("heartRate",sqlResult.get(0));
|
|
detailInfo.put("heartRate",sqlResult.get(0));
|
|
}else {
|
|
}else {
|
|
detailInfo.put("heartRate","无心率数据");
|
|
detailInfo.put("heartRate","无心率数据");
|
|
detailInfo.put("heartRate",new ArrayList<>());
|
|
|
|
}
|
|
}
|
|
//获取手表定位
|
|
//获取手表定位
|
|
JSONObject dw = patientDeviceService.getAqgDeviceInfo2(deviceSn);
|
|
JSONObject dw = patientDeviceService.getAqgDeviceInfo2(deviceSn);
|
|
@ -900,15 +880,11 @@ public class PatientInfoPlatFormService {
|
|
sql = " select o.id,p.id patient,p.name,p.idcard,p.residential_area,'20' OrderType,'1' type,o.serve_address,'紧急呼叫' serve_desc, " +
|
|
sql = " select o.id,p.id patient,p.name,p.idcard,p.residential_area,'20' OrderType,'1' type,o.serve_address,'紧急呼叫' serve_desc, " +
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_emergency_assistance_order o " +
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_emergency_assistance_order o " +
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 ";
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 ";
|
|
pageSql =bl?" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' ORDER BY create_time desc ": " ORDER BY create_time desc limit 1 ";
|
|
|
|
|
|
pageSql =bl?" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' ORDER BY create_time desc limit 1 ": " ORDER BY create_time desc limit 1 ";
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
if (sqlResult.size()>0){
|
|
if (sqlResult.size()>0){
|
|
detailInfo.put("warnStatus",true);
|
|
detailInfo.put("warnStatus",true);
|
|
if(!bl){
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
|
|
}else {
|
|
|
|
detailInfo.put("orderInfoList",sqlResult);
|
|
|
|
}
|
|
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
}else {
|
|
}else {
|
|
detailInfo.put("warnStatus",false);
|
|
detailInfo.put("warnStatus",false);
|
|
}
|
|
}
|
|
@ -930,15 +906,11 @@ public class PatientInfoPlatFormService {
|
|
sql = " select o.id,p.id patient,p.name,p.idcard,p.residential_area,'22' OrderType,'1' type,o.serve_address,o.serve_desc, " +
|
|
sql = " select o.id,p.id patient,p.name,p.idcard,p.residential_area,'22' OrderType,'1' type,o.serve_address,o.serve_desc, " +
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_security_monitoring_order o " +
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_security_monitoring_order o " +
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 ";
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 ";
|
|
pageSql =bl?" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' ORDER BY create_time desc ": " ORDER BY create_time desc limit 1 ";
|
|
|
|
|
|
pageSql =bl?" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' ORDER BY create_time desc limit 1 ": " ORDER BY create_time desc limit 1 ";
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
if (sqlResult.size()>0){
|
|
if (sqlResult.size()>0){
|
|
detailInfo.put("warnStatus",true);
|
|
detailInfo.put("warnStatus",true);
|
|
if(!bl){
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
|
|
}else {
|
|
|
|
detailInfo.put("orderInfoList",sqlResult);
|
|
|
|
}
|
|
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
}else {
|
|
}else {
|
|
detailInfo.put("warnStatus",false);
|
|
detailInfo.put("warnStatus",false);
|
|
}
|
|
}
|
|
@ -956,15 +928,11 @@ public class PatientInfoPlatFormService {
|
|
sql = " select o.id,p.id patient,p.name,p.idcard,p.residential_area,'22' OrderType,'1' type,o.serve_address,o.serve_desc, " +
|
|
sql = " select o.id,p.id patient,p.name,p.idcard,p.residential_area,'22' OrderType,'1' type,o.serve_address,o.serve_desc, " +
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_security_monitoring_order o " +
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_security_monitoring_order o " +
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 ";
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 ";
|
|
pageSql =bl?" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' ORDER BY create_time desc ": " ORDER BY create_time desc limit 1 ";
|
|
|
|
|
|
pageSql =bl?" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' ORDER BY create_time desc limit 1 ": " ORDER BY create_time desc limit 1 ";
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
if (sqlResult.size()>0){
|
|
if (sqlResult.size()>0){
|
|
detailInfo.put("warnStatus",true);
|
|
detailInfo.put("warnStatus",true);
|
|
if(!bl){
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
|
|
}else{
|
|
|
|
detailInfo.put("orderInfoList",sqlResult);
|
|
|
|
}
|
|
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
}else {
|
|
}else {
|
|
detailInfo.put("warnStatus",false);
|
|
detailInfo.put("warnStatus",false);
|
|
}
|
|
}
|
|
@ -996,15 +964,11 @@ public class PatientInfoPlatFormService {
|
|
sql = " select o.id,p.id patient,p.name,p.idcard,p.residential_area,'22' OrderType,'1' type,o.serve_address,o.serve_desc, " +
|
|
sql = " select o.id,p.id patient,p.name,p.idcard,p.residential_area,'22' OrderType,'1' type,o.serve_address,o.serve_desc, " +
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_security_monitoring_order o " +
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_security_monitoring_order o " +
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 ";
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 ";
|
|
pageSql =bl?" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' ORDER BY create_time desc ": " ORDER BY create_time desc limit 1 ";
|
|
|
|
|
|
pageSql =bl?" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' ORDER BY create_time desc limit 1 ": " ORDER BY create_time desc limit 1 ";
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
if (sqlResult.size()>0){
|
|
if (sqlResult.size()>0){
|
|
detailInfo.put("warnStatus",true);
|
|
detailInfo.put("warnStatus",true);
|
|
if(!bl){
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
|
|
}else {
|
|
|
|
detailInfo.put("orderInfoList",sqlResult);
|
|
|
|
}
|
|
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
}else {
|
|
}else {
|
|
detailInfo.put("warnStatus",false);
|
|
detailInfo.put("warnStatus",false);
|
|
}
|
|
}
|
|
@ -1022,15 +986,11 @@ public class PatientInfoPlatFormService {
|
|
sql = " select o.id,p.id patient,p.name,p.idcard,p.residential_area,'22' OrderType,'1' type,o.serve_address,o.serve_desc, " +
|
|
sql = " select o.id,p.id patient,p.name,p.idcard,p.residential_area,'22' OrderType,'1' type,o.serve_address,o.serve_desc, " +
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_security_monitoring_order o " +
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_security_monitoring_order o " +
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 ";
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 ";
|
|
pageSql =bl?" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' ORDER BY create_time desc ": " ORDER BY create_time desc limit 1 ";
|
|
|
|
|
|
pageSql =bl?" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' ORDER BY create_time desc limit 1 ": " ORDER BY create_time desc limit 1 ";
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
if (sqlResult.size()>0){
|
|
if (sqlResult.size()>0){
|
|
detailInfo.put("warnStatus",true);
|
|
detailInfo.put("warnStatus",true);
|
|
if(!bl){
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
|
|
}else {
|
|
|
|
detailInfo.put("orderInfoList",sqlResult);
|
|
|
|
}
|
|
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
}else {
|
|
}else {
|
|
detailInfo.put("warnStatus",false);
|
|
detailInfo.put("warnStatus",false);
|
|
}
|
|
}
|
|
@ -1074,29 +1034,21 @@ public class PatientInfoPlatFormService {
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_security_monitoring_order o " +
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_security_monitoring_order o " +
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 " +
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 " +
|
|
" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' " +
|
|
" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' " +
|
|
"ORDER BY create_time desc ";
|
|
|
|
|
|
"ORDER BY create_time desc limit 1 ";
|
|
}
|
|
}
|
|
sqlResult = jdbcTemplate.queryForList(sql);
|
|
sqlResult = jdbcTemplate.queryForList(sql);
|
|
if (sqlResult.size()>0){
|
|
if (sqlResult.size()>0){
|
|
detailInfo.put("warnStatus",true);
|
|
detailInfo.put("warnStatus",true);
|
|
if(!bl){
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
|
|
}else {
|
|
|
|
detailInfo.put("orderInfoList",sqlResult);
|
|
|
|
}
|
|
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
}else {
|
|
}else {
|
|
detailInfo.put("warnStatus",false);
|
|
detailInfo.put("warnStatus",false);
|
|
}
|
|
}
|
|
sql = "SELECT *,CAST(DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') as char) create_time FROM base_yxdevice_index " +
|
|
sql = "SELECT *,CAST(DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') as char) create_time FROM base_yxdevice_index " +
|
|
" WHERE sn = '" + deviceSn + "' AND lon != 0 AND lat != 0 ";
|
|
" WHERE sn = '" + deviceSn + "' AND lon != 0 AND lat != 0 ";
|
|
pageSql =bl?" and create_time >= '"+beforeTime+"' and create_time <= '"+afterTime+"' ORDER BY create_time ": " ORDER BY create_time DESC limit 1 ";
|
|
|
|
|
|
pageSql =bl?" and create_time >= '"+beforeTime+"' and create_time <= '"+afterTime+"' ORDER BY create_time limit 1 ": " ORDER BY create_time DESC limit 1 ";
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
if (sqlResult.size()>0){
|
|
if (sqlResult.size()>0){
|
|
if(!bl){
|
|
|
|
detailInfo.put("newlonlat",sqlResult.get(0));
|
|
|
|
}else {
|
|
|
|
detailInfo.put("newlonlatList",sqlResult);
|
|
|
|
}
|
|
|
|
|
|
detailInfo.put("newlonlat",sqlResult.get(0));
|
|
String address = LatitudeUtils.getLocationAddress(sqlResult.get(0).get("lat").toString(), sqlResult.get(0).get("lon").toString());
|
|
String address = LatitudeUtils.getLocationAddress(sqlResult.get(0).get("lat").toString(), sqlResult.get(0).get("lon").toString());
|
|
// JSONObject dz = gpsUtil.gcj02_To_Bd09(Double.parseDouble(sqlResult.get(0).get("lat").toString()),Double.parseDouble(sqlResult.get(0).get("lon").toString()));
|
|
// JSONObject dz = gpsUtil.gcj02_To_Bd09(Double.parseDouble(sqlResult.get(0).get("lat").toString()),Double.parseDouble(sqlResult.get(0).get("lon").toString()));
|
|
detailInfo.put("location", address);
|
|
detailInfo.put("location", address);
|
|
@ -1109,15 +1061,11 @@ public class PatientInfoPlatFormService {
|
|
sql = " select o.id,p.id patient,p.name,p.idcard,p.residential_area,'22' OrderType,'1' type,o.serve_address,o.serve_desc, " +
|
|
sql = " select o.id,p.id patient,p.name,p.idcard,p.residential_area,'22' OrderType,'1' type,o.serve_address,o.serve_desc, " +
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_security_monitoring_order o " +
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_security_monitoring_order o " +
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 ";
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 ";
|
|
pageSql =bl?" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' ORDER BY create_time desc " : " ORDER BY create_time desc limit 1 ";
|
|
|
|
|
|
pageSql =bl?" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' ORDER BY create_time desc limit 1 " : " ORDER BY create_time desc limit 1 ";
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
if (sqlResult.size()>0){
|
|
if (sqlResult.size()>0){
|
|
detailInfo.put("warnStatus",true);
|
|
detailInfo.put("warnStatus",true);
|
|
if(!bl){
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
|
|
}else {
|
|
|
|
detailInfo.put("orderInfoList",sqlResult);
|
|
|
|
}
|
|
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
}else {
|
|
}else {
|
|
detailInfo.put("warnStatus",false);
|
|
detailInfo.put("warnStatus",false);
|
|
}
|
|
}
|
|
@ -1130,29 +1078,34 @@ public class PatientInfoPlatFormService {
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
if (sqlResult.size()>0){
|
|
if (sqlResult.size()>0){
|
|
detailInfo.put("warnStatus",true);
|
|
detailInfo.put("warnStatus",true);
|
|
if(!bl){
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
|
|
}else {
|
|
|
|
detailInfo.put("orderInfoList",sqlResult);
|
|
|
|
}
|
|
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
}else {
|
|
}else {
|
|
detailInfo.put("warnStatus",false);
|
|
detailInfo.put("warnStatus",false);
|
|
}
|
|
}
|
|
|
|
//门禁数据
|
|
|
|
sql = " SELECT f.img,CAST(DATE_FORMAT(f.pass_time,'%Y-%m-%d %H:%i:%S') as char) passTime,p.name,f.patient from base_device_face_record f " +
|
|
|
|
" inner join base_patient p on f.patient = p.id " +
|
|
|
|
" where f.patient = '"+patient+"' ";
|
|
|
|
pageSql = bl?" and f.pass_time >= '"+beforeTime+"' and f.pass_time <= '"+afterTime+"' ORDER BY f.pass_time desc limit 1 ":" ORDER BY f.pass_time desc limit 1 ";
|
|
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
|
|
if(sqlResult.size()>0){
|
|
|
|
detailInfo.putAll(sqlResult.get(0));
|
|
|
|
}else {
|
|
|
|
detailInfo.put("img","");
|
|
|
|
detailInfo.put("passTime","");
|
|
|
|
detailInfo.put("name","");
|
|
|
|
detailInfo.put("patient","");
|
|
|
|
}
|
|
break;
|
|
break;
|
|
case "20"://电表监测
|
|
case "20"://电表监测
|
|
sql = " select o.id,p.id patient,p.name,p.idcard,p.residential_area,'22' OrderType,'1' type,o.serve_address,o.serve_desc, " +
|
|
sql = " select o.id,p.id patient,p.name,p.idcard,p.residential_area,'22' OrderType,'1' type,o.serve_address,o.serve_desc, " +
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_security_monitoring_order o " +
|
|
" o.status,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time from base_security_monitoring_order o " +
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 ";
|
|
" INNER JOIN base_patient p on p.id = o.patient where device_sn='"+deviceSn+"' and o.status=1 ";
|
|
pageSql = bl?" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' ORDER BY create_time desc ":" ORDER BY create_time desc limit 1 ";
|
|
|
|
|
|
pageSql = bl?" and o.create_time >= '"+beforeTime+"' and o.create_time <= '"+afterTime+"' ORDER BY create_time desc limit 1 ":" ORDER BY create_time desc limit 1 ";
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
sqlResult = jdbcTemplate.queryForList(sql+pageSql);
|
|
if (sqlResult.size()>0){
|
|
if (sqlResult.size()>0){
|
|
detailInfo.put("warnStatus",true);
|
|
detailInfo.put("warnStatus",true);
|
|
if(!bl){
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
|
|
}else {
|
|
|
|
detailInfo.put("orderInfoList",sqlResult);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
detailInfo.put("orderInfo",sqlResult.get(0));
|
|
}else {
|
|
}else {
|
|
detailInfo.put("warnStatus",false);
|
|
detailInfo.put("warnStatus",false);
|
|
}
|
|
}
|