Browse Source

Merge branch 'dev' of chinawu123/wlyy2.0 into dev

liubing 3 years ago
parent
commit
633b69ad90

+ 1 - 1
svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/DeviceManageService.java

@ -85,7 +85,7 @@ public class DeviceManageService extends BaseJpaService<BaseDeviceRepairEntity,B
            //level == 4 助老员
            if (doctorById.getLevel() == 4) {
                 repairSql ="SELECT DISTINCT" +
                         " pd.device_name AS deviceName,pd.category_code as categoryCode,dr.`status` AS `status` ,dr.bind_user_name AS bindName,dr.deal_peoper_name AS dealName,dr.create_time AS createTime" +
                         " dr.order_id as id,dr.repair_peoper_name AS repairName,pd.device_name AS deviceName,pd.category_code as categoryCode,dr.`status` AS `status` ,dr.bind_user_name AS bindName,dr.deal_peoper_name AS dealName,dr.create_time AS createTime" +
                         " FROM" +
                         " wlyy_patient_device pd," +
                         " base_device_repair dr," +