|
@ -425,11 +425,10 @@ public class PatientDeviceService extends BaseService {
|
|
Map map = new HashMap();
|
|
Map map = new HashMap();
|
|
PatientBloodSugger bloodSugger = null;
|
|
PatientBloodSugger bloodSugger = null;
|
|
PatientHealthTime patientHealthTime = null;
|
|
PatientHealthTime patientHealthTime = null;
|
|
if (StringUtils.isEmpty(user) && StringUtils.isEmpty(deviceSN)) {
|
|
|
|
bloodSugger = patientBloodSuggerDao.findRecent();
|
|
|
|
} else {
|
|
|
|
|
|
if (!StringUtils.isEmpty(user) && !StringUtils.isEmpty(deviceSN)) {
|
|
patientHealthTime = patientHealthTimeDao.findByUserAndSN(user, deviceSN);
|
|
patientHealthTime = patientHealthTimeDao.findByUserAndSN(user, deviceSN);
|
|
}
|
|
}
|
|
|
|
|
|
String fastingStart = null;
|
|
String fastingStart = null;
|
|
String fastingEnd = null;
|
|
String fastingEnd = null;
|
|
String afterBreakFastStart = null;
|
|
String afterBreakFastStart = null;
|
|
@ -445,6 +444,9 @@ public class PatientDeviceService extends BaseService {
|
|
String beforeSleepStart = null;
|
|
String beforeSleepStart = null;
|
|
String beforeSleepEnd = null;
|
|
String beforeSleepEnd = null;
|
|
if (patientHealthTime == null) {
|
|
if (patientHealthTime == null) {
|
|
|
|
|
|
|
|
bloodSugger = patientBloodSuggerDao.findRecent();
|
|
|
|
|
|
fastingStart = bloodSugger.getFastingStart();
|
|
fastingStart = bloodSugger.getFastingStart();
|
|
fastingEnd = bloodSugger.getFastingEnd();
|
|
fastingEnd = bloodSugger.getFastingEnd();
|
|
afterBreakFastStart = bloodSugger.getAfterBreakfastStart();
|
|
afterBreakFastStart = bloodSugger.getAfterBreakfastStart();
|