update

手术信息查询

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/app/controller/AppDeviceController.java

@@ -29,7 +29,7 @@ public class AppDeviceController {
     private final IBizDeviceAlarmService deviceAlarmService;
 
     @ApiOperationSupport(author = "lf",order = 1)
-    @ApiOperation(value="查询报警信",notes = "权限： 无")
+    @ApiOperation(value="查询报警信息",notes = "权限： 无")
     @PostMapping("/queryAlarm/list")
     public CommonResult<List<AppBizDeviceAlarmVO>> selectList(@RequestBody AppDeviceAlarmQueryDTO query) {
         return CommonResult.success(  deviceAlarmService.selectAppBizDeviceAlarmList(query));

tr-modules/tr-module-smartFollowUp/src/main/resources/mapper/smart/BizClinicRoomMapper.xml

@@ -225,7 +225,7 @@
         <result property="doctorAvatar" column="doctor_avatar"/>
     </resultMap>
 
-    <select id="selectClinicByCondition" resultType="cn.tr.module.smart.common.dto.BizClinicRoomDTO">
+    <select id="selectClinicByCondition" resultMap="webClinicListVO">
         SELECT
         bcr.id as id,
         bcr.clinic_name as clinic_name,
@@ -293,8 +293,8 @@
         su.nickName as nickName
         FROM
         biz_clinic_room bcr
-        JOIN biz_clinic_room_doctor_user bcrdu ON bcr.ID = bcrdu.clinic_room_id
-        Join sys_user su on bcrdu.user_id = su.id
+        left join biz_clinic_room_doctor_user bcrdu ON bcr.id = bcrdu.clinic_room_id
+        left join sys_user su on bcrdu.user_id = su.id
         <where>
             and bcr.deleted = 0
             <if test="patientId != null and patientId != ''">