add

查询住院号相关手术信息
新增输注泵对接

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

@@ -4,6 +4,7 @@ import cn.tr.core.pojo.CommonResult;
 import cn.tr.core.pojo.TableDataInfo;
 import cn.tr.core.validation.Insert;
 import cn.tr.module.smart.app.controller.dto.AppDoctorClinicFinishDTO;
+import cn.tr.module.smart.app.controller.dto.AppDoctorClinicQueryByPatientCodeDTO;
 import cn.tr.module.smart.app.controller.dto.AppDoctorClinicRoomDTO;
 import cn.tr.module.smart.app.controller.vo.WxDoctorClinicRoomThumbnailVO;
 import cn.tr.module.smart.app.controller.vo.WxDoctorClinicRoomVO;
@@ -80,7 +81,7 @@ public class AppClinicRoomController extends BaseController {
     @ApiOperationSupport(author = "lf",order = 7)
     @ApiOperation(value="查询住院号相关手术信息",notes = "权限： 无")
     @PostMapping("/queryPatientCode")
-    public CommonResult<List<WxDoctorClinicRoomThumbnailVO>> queryPatientCode(@RequestBody@Validated BizClinicAddOrEditDTO source) {
+    public CommonResult<List<WxDoctorClinicRoomThumbnailVO>> queryPatientCode(@RequestBody@Validated AppDoctorClinicQueryByPatientCodeDTO source) {
         return CommonResult.success(clinicRoomService.queryPatientCode(source));
     }
 

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

@@ -43,7 +43,4 @@ public class WxDoctorClinicRoomThumbnailVO implements Serializable {
 
     @ApiModelProperty("患者头像")
     private String patientAvatar;
-
-    @ApiModelProperty(value = "泵信息", position = 9)
-    private WxDoctorPumpInfoVO pumpInfo;
 }

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

@@ -1,6 +1,9 @@
 package cn.tr.module.smart.common.repository;
 
+import cn.tr.module.smart.app.controller.dto.AppDoctorClinicQueryByPatientCodeDTO;
 import cn.tr.module.smart.app.controller.dto.AppDoctorClinicRoomDTO;
+import cn.tr.module.smart.app.controller.vo.WxDoctorClinicRoomThumbnailVO;
+import cn.tr.module.smart.common.dto.BizClinicAddOrEditDTO;
 import cn.tr.module.smart.common.dto.BizClinicRoomDTO;
 import cn.tr.module.smart.common.dto.BizClinicRoomQueryDTO;
 import cn.tr.module.smart.web.dto.BizPatientClinicListDTO;
@@ -37,4 +40,6 @@ public interface BizClinicRoomRepository extends BaseMapper<BizClinicRoomPO> {
     List<BizClinicRoomDTO> selectClinicByCondition(@Param("queryDTO") BizClinicRoomQueryDTO queryDTO);
 
     List<BizPatientClinicListDTO> selectClinicAndDoctorByPatientIdList(@Param("patientId") String patientId);
+
+    List<WxDoctorClinicRoomThumbnailVO> selectListByPatientCode(@Param("source") AppDoctorClinicQueryByPatientCodeDTO source);
 }

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

@@ -121,5 +121,5 @@ public interface IBizClinicRoomService {
 
     Boolean validateCardNo(BizWxUserCheckCardNoDTO source) throws IOException;
 
-    List<WxDoctorClinicRoomThumbnailVO> queryPatientCode(BizClinicAddOrEditDTO source);
+    List<WxDoctorClinicRoomThumbnailVO> queryPatientCode(AppDoctorClinicQueryByPatientCodeDTO source);
 }

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

@@ -425,8 +425,8 @@ public class BizClinicRoomServiceImpl implements IBizClinicRoomService {
     }
 
     @Override
-    public List<WxDoctorClinicRoomThumbnailVO> queryPatientCode(BizClinicAddOrEditDTO source) {
-        return Collections.emptyList();
+    public List<WxDoctorClinicRoomThumbnailVO> queryPatientCode(AppDoctorClinicQueryByPatientCodeDTO source) {
+        return baseRepository.selectListByPatientCode(source);
     }
 
     /**
@@ -452,8 +452,4 @@ public class BizClinicRoomServiceImpl implements IBizClinicRoomService {
             baseInfo.setClinicStartTime(source.getClinicStartTime());
         }
     }
-
-    public static void main(String[] args) {
-        
-    }
 }

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

@@ -41,6 +41,19 @@
         <result property="assessCount" column="assess_count"/>
     </resultMap>
 
+
+    <resultMap id="stdThumbnailResult" type="cn.tr.module.smart.app.controller.vo.WxDoctorClinicRoomThumbnailVO">
+        <result property="clinicRoomId" column="clinic_room_id"/>
+        <result property="clinicName" column="clinic_name"/>
+        <result property="clinicStartTime" column="clinic_start_time"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="patientCode" column="patient_code"/>
+        <result property="patientName" column="patient_name"/>
+        <result property="patientAge" column="patient_age"/>
+        <result property="patientGender" column="patient_gender"/>
+        <result property="patientAvatar" column="patient_avatar"/>
+    </resultMap>
+
     <select id="stdSelectWxAppletClinicList" resultMap="stdWxAppletDetailResult">
         select
         bcr.id                as id,
@@ -222,4 +235,23 @@
             </if>
         </where>
     </select>
+
+    <select id="selectListByPatientCode" 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_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
+        from
+        biz_patient as bp
+        join biz_clinic_room as bcr on bp.current_clinic_id  = bcr.id
+        <where>
+            bp.deleted = 0 and bcr.deleted = 0 and bp.patient_code like concat('%',#{query.patientCode},'%')
+        </where>
+    </select>
 </mapper>