Explorar el Código

fix:修复bug

lsw hace 8 meses
padre
commit
883a2d43be

+ 2 - 2
admin-ui/src/views/work/follow/record/index.vue

@@ -91,10 +91,10 @@ export default {
     },
     op(tag, row) {
       if (tag == 'add') {
-        this.iframe({ obj: edit, param: { type: this.queryParams.type }, title: this.queryParams.type == 0 ? '新增提醒' : '新增回访', width: '55%', height: '77%' });
+        this.iframe({ obj: edit, param: { type: this.queryParams.type }, title: this.queryParams.type == 0 ? '新增提醒' : '新增回访', width: '57%', height: '85%' });
       }
       if (tag == 'edit') {
-        this.iframe({ obj: edit, param: { id: row.id, type: this.queryParams.type, patientName: row.patientName }, title: '编辑', width: '55%', height: '77%' });
+        this.iframe({ obj: edit, param: { id: row.id, type: this.queryParams.type, patientName: row.patientName }, title: '编辑', width: '57%', height: '85%' });
       }
       if (tag == 'detail') {
         this.iframe({ obj: detail, param: { id: row.id, detail: true, patientName: row.patientName }, title: '查看详情', width: '45%', height: '70%' });

+ 2 - 2
app/pages/visit/index.vue

@@ -2,11 +2,11 @@
 	<view class="main">
 		<view class="top">
 			<view class="nameBox">
-				<view class="name">{{param.patientName}}</view>
+				<view class="name">{{param.patientName||'暂无绑定就诊人'}}</view>
 				<text class="icon arrow" style="margin-left: 10px;">&#xeb73;</text>
 				<view class="change" @click="showChange = true">切换就诊人</view>
 			</view>
-			<view class="cardNum">{{param.patientId}}</view>
+			<view class="cardNum">{{param.patientId||''}}</view>
 			<view style="display: flex;text-align: center;margin: 5px;padding: 13px;font-size: 13px;"
 				@click="calendar = true">
 				<input placeholder="点击选择时间" :disabled="true" v-model="startTime" type="select" />

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/BindUserServiceImpl.java

@@ -87,7 +87,7 @@ public class BindUserServiceImpl extends ServiceImpl<BindUserMapper, BindUser> i
         if (bindUser.getPatientId().equals(AppUtil.getUser().getPatientId())) {
             User user = AppUtil.getUser();
             user.setPatientName("");
-            user.setPatientId(null);
+            user.setPatientId(0l);
             userService.updateById(user);
             tokenService.setLoginUser(user);
         }

+ 1 - 3
ruoyi-admin/src/main/resources/mapper/work/FollowRecordMapper.xml

@@ -41,11 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         tb_follow_record r
         LEFT JOIN sys_dept d ON d.dept_id = r.dept_id
         LEFT JOIN sys_user u ON u.user_id = r.user_id
-        <where>
+        WHERE r.patient_id = #{patientId}
             <if test="type != null "> AND r.type = #{type}</if>
-            <if test="patientId != null "> AND r.patient_id = #{patientId}</if>
             <if test="state != null "> AND r.state = #{state}</if>
-        </where>
         ORDER BY r.id DESC
     </select>