|
@ -32,12 +32,9 @@ import org.springframework.data.domain.Sort;
|
|
|
import org.springframework.data.domain.Sort.Direction;
|
|
|
import org.springframework.jdbc.core.BeanPropertyRowMapper;
|
|
|
import org.springframework.jdbc.core.JdbcTemplate;
|
|
|
import org.springframework.jdbc.core.RowMapper;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.sql.ResultSet;
|
|
|
import java.sql.SQLException;
|
|
|
import java.text.DecimalFormat;
|
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
@ -415,7 +412,6 @@ public class PatientHealthIndexService {
|
|
|
String data = item.get("value1").toString();
|
|
|
String dataType = item.get("value2").toString();
|
|
|
String deviceSn = item.get("device_sn") == null ? "" : item.get("device_sn").toString();
|
|
|
System.out.println(item.get("record_date").toString());
|
|
|
Date recordDate = dateFormat6.parse(item.get("record_date").toString());
|
|
|
Long id = Long.parseLong(item.get("id") + "");
|
|
|
Date createDate = (Date)item.get("createDate");
|
|
@ -781,12 +777,7 @@ public class PatientHealthIndexService {
|
|
|
" and a.type="+type+" and a.record_date >= '"+DateUtil.dateToStrLong(startDate)+"' and a.record_date <= '"+DateUtil.dateToStrLong(endDate)+"' " +
|
|
|
"and a.del = '1' group by DATE_FORMAT(a.record_date,'%Y-%m-%d')" +
|
|
|
" order by DATE_FORMAT(a.record_date,'%Y-%m-%d') desc limit "+page+" ,"+size;
|
|
|
return jdbcTemplate.query(sql, new RowMapper<String>() {
|
|
|
@Override
|
|
|
public String mapRow(ResultSet resultSet, int i) throws SQLException {
|
|
|
return null;
|
|
|
}
|
|
|
});
|
|
|
return jdbcTemplate.queryForList(sql, String.class);
|
|
|
}
|
|
|
|
|
|
|