|
@ -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,dr.`status` AS `status` ,dr.bind_user_name AS bindName,dr.deal_peoper_name AS dealName,dr.create_time AS createTime" +
|
|
|
" 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," +
|
|
@ -100,7 +100,7 @@ public class DeviceManageService extends BaseJpaService<BaseDeviceRepairEntity,B
|
|
|
" AND ph.doctor = '"+doctor+"'" +
|
|
|
" AND ph.del = '1'";
|
|
|
} else {
|
|
|
repairSql = "SELECT DISTINCT dr.order_id AS id,dr.bind_user_name AS patientName," +
|
|
|
repairSql = "SELECT DISTINCT dr.order_id AS id,dr.bind_user_name AS patientName, pd.category_code as categoryCode," +
|
|
|
" dr.`status` AS `status`,dr.create_time AS createTime,dr.repair_peoper_name AS repairName,wd.device_name AS deviceName" +
|
|
|
" FROM" +
|
|
|
" wlyy_patient_device pd," +
|