修复bug

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

@@ -14,13 +14,13 @@
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-button type="primary" icon="el-icon-plus" :disabled="ids.length > 0" @click="op('add')" v-hasPermi="['work:record:add', 'work:up:add']">{{ queryParams.type == 0 ? '新增提醒' : '新增回访' }}</el-button>
-      <el-button type="primary" icon="el-icon-download" @click="handleExport" v-hasPermi="['work:record:export', 'work:up:add']">导出</el-button>
-      <el-button type="danger" icon="el-icon-delete" :disabled="ids.length == 0" @click="del" v-hasPermi="['work:record:remove', 'work:up:remove']">删除{{ ids.length > 0 ? '(' + ids.length + ')' : '' }}</el-button>
+      <el-button type="primary" icon="el-icon-download" @click="handleExport" v-hasPermi="['work:record:export', 'work:up:add']" v-if="queryParams.type == 1">导出</el-button>
+      <el-button type="danger" icon="el-icon-delete" :disabled="ids.length == 0" @click="del" v-hasPermi="['work:record:remove', 'work:up:remove']" v-if="user.roleName == '超级管理员' || user.roleName == '管理员'">删除{{ ids.length > 0 ? '(' + ids.length + ')' : '' }}</el-button>
       <el-button size="mini" type="text" icon="el-icon-delete" @click="op('recycle')" v-if="user.roleName == '超级管理员' || user.roleName == '管理员'" style="float: right; margin-top: 10px">回收站</el-button>
     </el-row>
 
     <el-table :data="response.rows" border @selection-change="selects" height="calc(100vh - 270px)">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center" v-if="user.roleName == '超级管理员' || user.roleName == '管理员'"/>
       <el-table-column label="模板名称" align="left" prop="templateName" />
       <el-table-column label="患者姓名" align="center" prop="patientName" width="100" />
       <el-table-column label="住院号" align="center" prop="blh" width="120" />

admin-ui/src/views/work/follow/record/recycle.vue

@@ -17,7 +17,7 @@
       <el-button type="danger" icon="el-icon-delete" :disabled="ids.length == 0" @click="del" v-hasPermi="['work:record:remove', 'work:up:remove']">删除{{ ids.length > 0 ? '(' + ids.length + ')' : '' }}</el-button>
     </el-row>
 
-    <el-table :data="response.rows" border @selection-change="selects" height="calc(100vh - 270px)">
+    <el-table :data="response.rows" border @selection-change="selects" >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="queryParams.type == 0 ? '提醒标题' : '模板名称'" align="left" prop="templateName" />
       <el-table-column label="患者姓名" align="center" prop="patientName" width="100" />

app/components/images/images.vue

@@ -8,7 +8,7 @@
 			</view>
 		</view>
 		<!-- 	<audio :src="ip + value[0]" v-if="type === '录音' && read" name="录音文件" controls @click="playVoice()"></audio> -->
-		<view v-if="type === '录音' && read">
+		<view v-if="type === '录音' && read" class="audio">
 			<button @click="playStop()" :disabled="!play">
 				<text class="icon">&#xe611;</text>
 				<text>停止</text>
@@ -204,7 +204,11 @@ export default {
 		},
 		again() {
 			this.voicePath = '';
-			this.startRecord();
+			this.value = [];
+			this.endRecord();
+			setTimeout(() => {
+				this.startRecord();
+			}, 200);
 		},
 		playVoice() {
 			console.log('播放录音');

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/FollowRecord.java

@@ -53,12 +53,21 @@ public class FollowRecord extends BaseData {
     @TableField(exist = false)
     private String blh;
 
+    @TableField(exist = false)
+    @Excel(name = "出院时间",dateFormat = "yyyy-MM-dd",sort =4)
+    private Date dischargeTime;
+
+    @TableField(exist = false)
+    @Excel(name = "主管医生",sort =5)
+    private String physician;
+
+
     @NotBlank(message = "回访内容或者提醒内容不能为空")
     @ApiModelProperty(value = "回访内容")
     private String op;
 
     @ApiModelProperty(value = "状态:0=未回访,1=已回访")
-    @Excel(name = "随访状态", readConverterExp = "0=未回访,1=已回访",sort =7)
+    @Excel(name = "随访状态", readConverterExp = "0=未回访,1=已回访",sort =8)
     private Integer state;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/UserServiceImpl.java

@@ -57,7 +57,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     @Override
     public AjaxResult login(LoginDto dto) throws ServerException {
-        JSONObject res = JSON.parseObject(HttpUtils.sendGet("https://api.weixin.qq.com:4430/sns/jscode2session?appid=" + env.getProperty("wx.appid") + "&secret=" + env.getProperty("wx.appSecret") + "&js_code=" + dto.getCode() + "&grant_type=authorization_code", null));
+        JSONObject res = JSON.parseObject(HttpUtils.sendGet("https://api.weixin.qq.com/sns/jscode2session?appid=" + env.getProperty("wx.appid") + "&secret=" + env.getProperty("wx.appSecret") + "&js_code=" + dto.getCode() + "&grant_type=authorization_code", null));
         if (StringUtils.isNotEmpty(res.getString("errmsg"))) {
             return AjaxResult.error("获取openid失败");
         }
@@ -109,6 +109,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     }
 
     @Override
+    public User selectUserByPatientId(Long patientId) {
+        return userMapper.selectUserByPatientId(patientId);
+    }
+
+    @Override
     public AjaxResult enable(User user) {
         if (!updateById(user)) {
             throw new ServiceException("启用或停用账户失败");

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

@@ -15,11 +15,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         k.update_time,
         k.return_time,
         d.dept_name AS deptName,
-        p.blh
+        p.blh,
+        v.discharge_time,
+        v.physician
         FROM
         tb_follow_record k
         LEFT JOIN sys_dept d ON d.dept_id = k.dept_id
         LEFT JOIN tb_patient p ON p.id=k.patient_id
+        LEFT JOIN tb_visit v ON v.pat_id=k.patient_id
         WHERE 1=1
             <if test="type != null "> and k.type = #{type}</if>
             <if test="delFlag != null "> and k.del_flag = #{delFlag}</if>

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseData.java

@@ -45,12 +45,12 @@ public class BaseData {
     private String dateEnd;
 
     @TableField(fill = FieldFill.INSERT)
-    @Excel(name = "随访发起人员",sort =5)
+    @Excel(name = "随访发起人员",sort =6)
     private String createBy;
 
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "随访发起时间",dateFormat = "yyyy-MM-dd HH:mm",sort =6,width=30)
+    @Excel(name = "随访发起时间",dateFormat = "yyyy-MM-dd HH:mm",sort =7,width=30)
     private Date createTime;
 
     @TableField(fill = FieldFill.UPDATE)