代码修改

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/security/SecurityMonitoringOrderService.java

@@ -692,7 +692,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        String fliter = "  ";
        String sql = " select p.id patientCode,p.name,p.sex,p.photo,p.idcard,ord.id orderId,ord.number,ord.serve_desc,ord.create_time,ord.`status`,ord.doctor," +
                "ord.doctor_name,ord.update_user,ord.update_user_name,ord.patient_phone,ord.conclusion_status from base_security_monitoring_order ord INNER JOIN base_patient p on p.id = ord.patient " +
                "where 1=1 and ord.type = 3  ";
                "where 1=1  ";
        if (1 == dailyMonitor) {//医生日常监护居民安防工单列表查询
            if (StringUtils.isBlank(topicItem) || StringUtils.isBlank(doctor)) {

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/service/DeviceService.java

@@ -1084,7 +1084,7 @@ public class DeviceService {
                    patientHealthIndex.setDeviceSn(device);
                    patientHealthIndex.setUser(devicePatientDevice.getUser());
                    patientHealthIndex.setIdcard(devicePatientDevice.getUserIdcard());
                    patientHealthIndex.setValue1(heartrate + "");
                    patientHealthIndex.setValue1(breath + "");
                    patientHealthIndex.setType(7);
                    Date recordDate = DateUtil.strToDate(time_begin);
                    patientHealthIndex.setRecordDate(recordDate);