update

医生查询时已绑定的患者不查询

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

@@ -90,10 +90,10 @@ public class AppClinicRoomController extends BaseController {
     }
 
     @ApiOperationSupport(author = "lf",order = 7)
-    @ApiOperation(value="查询住院号相关手术信息",notes = "权限： 无")
+    @ApiOperation(value="查询住院号相关未绑定医生的手术信息",notes = "权限： 无")
     @PostMapping("/queryPatientCode")
     public CommonResult<List<WxDoctorClinicRoomThumbnailVO>> queryPatientCode(@RequestBody@Validated AppDoctorClinicQueryByPatientCodeDTO source) {
-        return CommonResult.success(clinicRoomService.queryPatientCode(source));
+        return CommonResult.success(clinicRoomService.stdAppSelectListByPatientCode(source));
     }
 
     @ApiOperationSupport(author = "lf",order = 7)

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/repository/BizClinicRoomRepository.java

@@ -58,4 +58,6 @@ public interface BizClinicRoomRepository extends BaseMapper<BizClinicRoomPO> {
     BizClinicAndQuestionVO selectClinicAndQuestionByClinicId(@Param("clinicId") String clinicId);
 
     BizClinicAndAssessmentVO selectClinicAndAssessmentByClinicId(@Param("clinicId") String clinicId);
+
+    List<WxDoctorClinicRoomThumbnailVO> stdAppselectListByPatientCode(@Param("query") AppDoctorClinicQueryByPatientCodeDTO source);
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/IBizClinicRoomService.java

@@ -132,6 +132,8 @@ public interface IBizClinicRoomService {
 
     List<WxDoctorClinicRoomThumbnailVO> queryPatientCode(AppDoctorClinicQueryByPatientCodeDTO source);
 
+    List<WxDoctorClinicRoomThumbnailVO> stdAppSelectListByPatientCode(AppDoctorClinicQueryByPatientCodeDTO source);
+
     AppDoctorInfusionHistoryVO selectByClinicRoomAndPatientByClinicId(String clinicId);
 
     BizMpPublishInfoDTO selectMpPushTaskInfoById(String clinicId);

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizClinicRoomServiceImpl.java

@@ -481,6 +481,11 @@ public class BizClinicRoomServiceImpl implements IBizClinicRoomService {
         return baseRepository.selectListByPatientCode(source);
     }
 
+    @Override
+    public List<WxDoctorClinicRoomThumbnailVO> stdAppSelectListByPatientCode(AppDoctorClinicQueryByPatientCodeDTO source) {
+        return baseRepository.stdAppselectListByPatientCode(source);
+    }
+
     @Override
     public AppDoctorInfusionHistoryVO selectByClinicRoomAndPatientByClinicId(String clinicId) {
         BizInfusionClinicPO infusionClinic = infusionClinicRepository.selectOne(new LambdaQueryWrapper<BizInfusionClinicPO>()

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

@@ -233,6 +233,10 @@
         <result property="doctorNickname" column="doctor_nickname"/>
         <result property="doctorAvatar" column="doctor_avatar"/>
         <result property="doctorId" column="doctor_id"/>
+        <result property="deviceId" column="device_id"/>
+        <result property="deviceType" column="device_type"/>
+        <result property="deviceRunState" column="device_run_state"/>
+        <result property="deviceAlarm" column="device_alarm"/>
     </resultMap>
 
     <select id="selectClinicByCondition" resultMap="webClinicListVO">
@@ -256,13 +260,19 @@
         su.nickname as doctor_nickname,
         su.avatar as doctor_avatar,
         su.id as doctor_id,
+        bih.device_id as device_id,
+        bih.device_type as device_type,
+        bih.device_run_state as device_run_state,
+        bih.device_alarm as device_alarm,
         bcr.create_time as create_time
         FROM
         biz_clinic_room bcr
         LEFT JOIN biz_clinic_room_wx_user bcrwu ON bcr.id = bcrwu.clinic_room_id
         LEFT JOIN biz_clinic_room_doctor_user bcrdu on bcr.id = bcrdu.clinic_room_id
-        left join biz_wx_user as bwu on bwu.id = bcrwu.wx_user_id
+        LEFT JOIN biz_wx_user as bwu on bwu.id = bcrwu.wx_user_id
         LEFT JOIN sys_user as su ON bcrdu.user_id = su.id
+        LEFT JOIN biz_infusion_clinic as bic on bic.clinic_id = bcr.id
+        left join biz_infusion_history as bih on bih.id=bic.infusion_id
         <where>
             and bcr.deleted = 0
             <if test="queryDTO.deptId != null and queryDTO.deptId != ''">
@@ -579,4 +589,35 @@
             bpa.create_time desc
         LIMIT 1
     </select>
+
+    <select id="stdAppselectListByPatientCode" resultMap="stdThumbnailResult">
+        select
+        bcr.id as clinic_room_id,
+        bcr.clinic_name as clinic_name,
+        bcr.clinic_start_time as clinic_start_time,
+        bcr.dept_id as dept_id,
+        bp.id as patient_id,
+        bcr.dept_name as dept_name,
+        bcr.patient_code as patient_code,
+        bcr.patient_name as patient_name,
+        bcr.patient_gender as patient_gender,
+        bcr.patient_age as patient_age,
+        bcr.image_url as patient_avatar,
+        bcr.last_modify_user_type as last_modify_user_type,
+        bp.card_no as card_no,
+        bp.new_human as new_human,
+        bcrdu.user_id as doctor_id,
+        bcrwu.wx_user_id as wx_user_id
+        from
+        biz_patient as bp
+        join biz_clinic_room as bcr on bp.current_clinic_id  = bcr.id
+        left join biz_clinic_room_wx_user as bcrwu on bcr.id = bcrwu.clinic_room_id
+        left join biz_clinic_room_doctor_user as bcrdu on bcr.id = bcrdu.clinic_room_id
+        <where>
+            bcrdu.id is null and bp.deleted = 0 and bcr.deleted = 0 and bp.patient_code like concat('%',#{query.patientCode},'%')
+            <if test="query.wxUserId !=null and query.wxUserId != ''">
+                and bcrwu.wx_user_id = #{query.wxUserId}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -110,7 +110,7 @@
         bih.create_time as create_time
         FROM
         biz_device bd
-        left JOIN biz_infusion_history bih ON bd.infusion_id = bih.id
+        JOIN biz_infusion_history bih ON bd.infusion_id = bih.id
         left JOIN biz_infusion_clinic bic ON bih.id = bic.infusion_id
         left JOIN biz_clinic_room bcr ON bic.clinic_id = bcr.id
         <where>