diff --git a/db/sql/xj_consult.sql b/db/sql/xj_consult.sql index 3c89c10..7b33a0e 100644 --- a/db/sql/xj_consult.sql +++ b/db/sql/xj_consult.sql @@ -609,7 +609,7 @@ CREATE TABLE `con_helper` ( `graduation_time` date NULL DEFAULT NULL COMMENT '毕业时间', `registration_time` datetime NULL DEFAULT NULL COMMENT '注册时间', `address` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '联系地址', - `helper_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '小助手编号', + `helper_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '全科医生编号', `flag` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '是否接受咨询1接受咨询2拒绝咨询', `work_time` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '参加工作时间', `practicing_experience` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '执业经历', @@ -626,7 +626,7 @@ CREATE TABLE `con_helper` ( `memo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注', `org_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '所属部门', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '小助手表' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '全科医生表' ROW_FORMAT = Dynamic; -- ---------------------------- -- Table structure for con_helper_online diff --git a/db/updatesql/20251210-咨询服务新加表.sql b/db/updatesql/20251210-咨询服务新加表.sql new file mode 100644 index 0000000..8ab58c2 --- /dev/null +++ b/db/updatesql/20251210-咨询服务新加表.sql @@ -0,0 +1,36 @@ +/* + Navicat Premium Data Transfer + + Source Server : 蚁熊-阿里云 + Source Server Type : MySQL + Source Server Version : 80404 + Source Host : localhost:3306 + Source Schema : health_consult + + Target Server Type : MySQL + Target Server Version : 80404 + File Encoding : 65001 + + Date: 10/12/2025 15:53:17 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for im_msg_read_log +-- ---------------------------- +DROP TABLE IF EXISTS `im_msg_read_log`; +CREATE TABLE `im_msg_read_log` ( + `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'id', + `group_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '群组ID', + `from_account` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '发送者账号', + `to_account` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '接受者账号', + `msg_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '消息ID(腾讯IM平台生成的消息ID)', + `read_count` int NOT NULL COMMENT '读取次数(点击次数)', + `read_time` datetime NOT NULL COMMENT '读取时间', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `group_id`(`group_id` ASC, `msg_id` ASC) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/bean/SessionFilter.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/bean/SessionFilter.java index 56a50ec..aeb2d12 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/bean/SessionFilter.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/bean/SessionFilter.java @@ -27,7 +27,7 @@ public class SessionFilter extends PageInfo { @Schema(description = "咨询方式 1图文聊天2音视频3电话4应急") private String contentType; - @Schema(description = "咨询类型 1员工咨询专家2员工咨询小助手3专家咨询小助手") + @Schema(description = "咨询类型 1员工咨询专家2员工咨询全科医生3专家咨询全科医生") @NotBlank(message = "未知的查询类型") private String sessionType; diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConHelperDTO.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConHelperDTO.java index f16a21a..8e239f8 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConHelperDTO.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConHelperDTO.java @@ -8,7 +8,7 @@ import lombok.Data; @Data public class ConHelperDTO extends ConPage { - @Schema(title = "小助手姓名") + @Schema(title = "全科医生姓名") private String userName; @Schema(title = "状态") diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConSessionDTO.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConSessionDTO.java index 08d47c4..27923f4 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConSessionDTO.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/dto/ConSessionDTO.java @@ -40,7 +40,7 @@ public class ConSessionDTO extends ConPage { @Schema(title = "咨询结束日期") private String endDate; - @Schema(title = "菜单type(1为员工咨询专家 2用户咨询小助手 3专家咨询小助手)") + @Schema(title = "菜单type(1为员工咨询专家 2用户咨询全科医生 3专家咨询全科医生)") private String sessionType; @Schema(title = "二级单位id") diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConHelper.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConHelper.java index 7a0e42f..960139f 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConHelper.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConHelper.java @@ -136,10 +136,10 @@ public class ConHelper extends ConPage implements Serializable { @Schema(title = "联系地址") private String address; /** - * 小助手编号 + * 全科医生编号 */ - @Excel(name = "小助手编号", width = 15) - @Schema(title = "小助手编号") + @Excel(name = "全科医生编号", width = 15) + @Schema(title = "全科医生编号") private String helperId; /** * 是否接受咨询1接受咨询2拒绝咨询 diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConSession.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConSession.java index 9564563..eb90f87 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConSession.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ConSession.java @@ -56,8 +56,8 @@ public class ConSession extends ConPage implements Serializable { /** * 接受者id */ - @Excel(name = "接受者id(小助手id)", width = 15) - @Schema(title = "接受者id(小助手id)") + @Excel(name = "接受者id(全科医生id)", width = 15) + @Schema(title = "接受者id(全科医生id)") private String toAccount; /** * 会话结束时间 @@ -82,10 +82,10 @@ public class ConSession extends ConPage implements Serializable { @Schema(title = "预约时间") private Date reservationTime; /** - * 1专家2小助手 + * 1专家2全科医生 */ - @Excel(name = "1员工咨询专家2员工咨询小助手3专家咨询小助手", width = 15) - @Schema(title = "1员工咨询专家2员工咨询小助手3专家咨询小助手") + @Excel(name = "1员工咨询专家2员工咨询全科医生3专家咨询全科医生", width = 15) + @Schema(title = "1员工咨询专家2员工咨询全科医生3专家咨询全科医生") @Dict(dicCode = "con_type") private String sessionType; /** @@ -103,8 +103,8 @@ public class ConSession extends ConPage implements Serializable { /** * 接受者姓名 */ - @Excel(name = "接受者姓名(小助手姓名)", width = 15) - @Schema(title = "接受者姓名(小助手姓名)") + @Excel(name = "接受者姓名(全科医生姓名)", width = 15) + @Schema(title = "接受者姓名(全科医生姓名)") private String toName; /** * im聊天信息id diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ImMsgReadLog.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ImMsgReadLog.java new file mode 100644 index 0000000..7bb2561 --- /dev/null +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/ImMsgReadLog.java @@ -0,0 +1,65 @@ +package com.renkang.consultation.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: Im消息已读日志 , 目前用于新疆项目中医生名片点击次数限制 且此表中暂时只存储了医生名片类型的消息 + * @Author: feng + * @Date: 2025-12-10 + * @Version: V1.0 + */ +@Data +@TableName("im_msg_read_log") +@EqualsAndHashCode(callSuper = false) +@Schema(title = "Im消息已读日志", description = "Im消息已读日志") +public class ImMsgReadLog implements Serializable { + private static final long serialVersionUID = 1L; + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(title = "id") + private String id; + /** + * 群组ID + */ + @Schema(title = "群组ID") + private String groupId; + /** + * 发送者账号 + */ + @Schema(title = "发送者账号") + private String fromAccount; + /** + * 接受者账号(消息已读人员账号) + */ + @Schema(title = "接受者账号") + private String toAccount; + /** + * 消息ID (腾讯IM平台生成的消息ID 并非im_msg_record_all表的ID) + */ + @Schema(title = "消息ID(腾讯IM平台生成的消息ID)") + private String msgId; + /** + * 读取次数(点击次数) + */ + @Schema(title = "读取次数(点击次数)") + private Integer readCount; + /** + * 发送时间 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(title = "读取时间") + private Date readTime; +} diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/UserToHelpExportVO.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/UserToHelpExportVO.java index 2aa38bf..68f0ace 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/UserToHelpExportVO.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/entity/UserToHelpExportVO.java @@ -39,9 +39,9 @@ public class UserToHelpExportVO { private String userDeptName; /** - * 小助手姓名 + * 全科医生姓名 */ - @Excel(name = "小助手", width = 15,orderNum = "6") + @Excel(name = "全科医生", width = 15,orderNum = "6") private String doctorName; /** diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ConHelperHelperVO.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ConHelperHelperVO.java index e79926c..83f5b04 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ConHelperHelperVO.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ConHelperHelperVO.java @@ -8,14 +8,14 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -@Schema(title = "小助手信息小助手对象") +@Schema(title = "全科医生信息对象") @Data public class ConHelperHelperVO { - @Schema(title = "小助手id") + @Schema(title = "全科医生id") private String id; - @Schema(title = "小助手姓名") + @Schema(title = "全科医生姓名") private String helperName; @Schema(title = "部门id") @@ -69,7 +69,7 @@ public class ConHelperHelperVO { @Schema(title = "是否接受咨询1接受咨询2拒绝咨询") private String flag; - @Schema(title = "小助手编号") + @Schema(title = "全科医生编号") private String helperId; @Schema(title = "参加工作时间") diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ConHelperUserVO.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ConHelperUserVO.java index ada1bc8..5982c8d 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ConHelperUserVO.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ConHelperUserVO.java @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -@Schema(title = "小助手信息用户对象") +@Schema(title = "全科医生信息用户对象") @Data public class ConHelperUserVO { diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ConHelperVO.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ConHelperVO.java index b6bbf49..e924562 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ConHelperVO.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ConHelperVO.java @@ -12,9 +12,9 @@ public class ConHelperVO { @Schema(title = "id") private String id; - @Schema(title = "小助手姓名") + @Schema(title = "全科医生姓名") private String userName; - @Schema(title = "小助手账号") + @Schema(title = "全科医生账号") private String userAccount; @Schema(title = "头像") diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ConSessionHelperVO.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ConSessionHelperVO.java index 5a2416c..c1c6916 100644 --- a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ConSessionHelperVO.java +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ConSessionHelperVO.java @@ -70,12 +70,12 @@ public class ConSessionHelperVO { @Schema(title = "历史咨询专用") private String name; - @Schema(title = "小助手id") + @Schema(title = "全科医生id") private String helperId; - @Schema(title = "小助手姓名") + @Schema(title = "全科医生姓名") private String helperName; - @Schema(title = "1员工咨询专家2员工咨询小助手3专家咨询小助手") + @Schema(title = "1员工咨询专家2员工咨询全科医生3专家咨询全科医生") private String sessionType; } diff --git a/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ImMsgReadLogVO.java b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ImMsgReadLogVO.java new file mode 100644 index 0000000..aee846c --- /dev/null +++ b/health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ImMsgReadLogVO.java @@ -0,0 +1,35 @@ +package com.renkang.consultation.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +@Schema(title = "Im消息已读日志vo", description = "Im消息已读日志vo") +public class ImMsgReadLogVO { + /** + * 群组ID + */ + @Schema(title = "群组ID") + @NotNull(message = "缺少必填参数:groupid") + private String groupId; + /** + * 发送者账号 + */ + @Schema(title = "发送者账号") + @NotNull(message = "缺少必填参数:fromAccount") + private String fromAccount; + /** + * 接受者账号(消息已读人员账号) + */ + @Schema(title = "接受者账号") + @NotNull(message = "缺少必填参数:toAccount") + private String toAccount; + /** + * 消息ID (腾讯IM平台生成的消息ID 并非im_msg_record_all表的ID) + */ + @Schema(title = "消息ID(腾讯IM平台生成的消息ID)") + @NotNull(message = "缺少必填参数:msgId") + private String msgId; +} diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/controller/ConHelperApiController.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/controller/ConHelperApiController.java index c9b360a..55424db 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/controller/ConHelperApiController.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/controller/ConHelperApiController.java @@ -19,7 +19,7 @@ public class ConHelperApiController { @Autowired private ConHelperApiService conHelperApiService; - @Operation(summary = "查询小助手", description = "查询问题列表") + @Operation(summary = "查询全科医生", description = "查询问题列表") @GetMapping("/selectHelperInfo") public Result selectHelperInfo() { @@ -27,11 +27,11 @@ public class ConHelperApiController { } /** - * 查询小助手 + * 查询全科医生 * @param helpId * @return */ - @Operation(summary = "查询小助手", description = "查询小助手") + @Operation(summary = "查询全科医生", description = "查询全科医生") @GetMapping("/selectHelperInfoDesc") public Result selectHelperInfoDesc(@RequestParam(value = "helpId") String helpId) { @@ -39,11 +39,11 @@ public class ConHelperApiController { } /** - * 查询是否小助手 + * 查询是否全科医生 * @param helpId * @return */ - @Operation(summary = "查询是否小助手", description = "查询是否小助手") + @Operation(summary = "查询是否全科医生", description = "查询是否全科医生") @GetMapping("/selectTfHelper") public Result selectTfHelper(@RequestParam(value = "helpId") String helpId) { diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/controller/ConSessionApiController.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/controller/ConSessionApiController.java index 7acc054..be1e301 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/controller/ConSessionApiController.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/controller/ConSessionApiController.java @@ -43,11 +43,11 @@ public class ConSessionApiController { } /** - * 专家咨询小助手 + * 专家咨询全科医生 * * @return */ - @Operation(summary = "专家咨询小助手", description = "专家咨询小助手") + @Operation(summary = "专家咨询全科医生", description = "专家咨询全科医生") @GetMapping("/insertProfessorAndHelperSession") public Result> insertProfessorAndHelperSession() { @@ -55,12 +55,12 @@ public class ConSessionApiController { } /** - * 专家咨询小助手 展示小助手Id + * 专家咨询全科医生 展示全科医生Id * * @return */ - @Operation(summary = "专家咨询小助手 展示", description = "专家咨询小助手") + @Operation(summary = "专家咨询全科医生 展示", description = "专家咨询全科医生") @GetMapping("/insertProfessorAndHelperSessionShow") public Result insertProfessorAndHelperSessionShow() { @@ -68,11 +68,11 @@ public class ConSessionApiController { } /** - * 用户咨询小助手 + * 用户咨询全科医生 * * @return */ - @Operation(summary = "用户咨询小助手", description = "用户咨询小助手") + @Operation(summary = "用户咨询全科医生", description = "用户咨询全科医生") @GetMapping("/insertUserAndHelperSession") public Result> insertUserAndHelperSession() { @@ -310,14 +310,14 @@ public class ConSessionApiController { } - @Operation(summary = "小助手咨询开始", description = "小助手咨询开始") + @Operation(summary = "全科医生咨询开始", description = "全科医生咨询开始") @GetMapping("/startPictureTextSessionHelper") public Result startPictureTextSessionHelper(@RequestParam(value = "fromAccount") String fromAccount, @RequestParam(value = "toAccount") String toAccount) { return conSessionApiService.startPictureTextSessionHelper(fromAccount, toAccount); } - @Operation(summary = "专家咨询小助手 和 用户咨询小助手 超过四个小时结束", description = "专家咨询小助手 和 用户咨询小助手 超过四个小时结束") + @Operation(summary = "专家咨询全科医生 和 用户咨询全科医生 超过四个小时结束", description = "专家咨询全科医生 和 用户咨询全科医生 超过四个小时结束") @GetMapping("/endUserAndProfessiorHelper") public Result endUserAndProfessiorHelper(@RequestParam(value = "expireHour") String expireHour) { return conSessionApiService.endUserAndProfessiorHelper(expireHour); @@ -450,7 +450,7 @@ public class ConSessionApiController { * @param pageSize * @return */ - @Operation(summary = "查询咨询列表 小助手", description = "查询咨询列表 小助手") + @Operation(summary = "查询咨询列表 全科医生", description = "查询咨询列表 全科医生") @GetMapping("/selectSessionListByDoctorIdHelper") public Result> selectSessionListByDoctorIdHelper(@RequestParam(value = "pageNo", defaultValue = "1") int pageNo, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) { @@ -473,7 +473,7 @@ public class ConSessionApiController { * 青海使用用户咨询 全科专家 * @return */ - @Operation(summary = "用户咨询小助手 新的", description = "用户咨询小助手 新的") + @Operation(summary = "用户咨询全科医生 新的", description = "用户咨询全科医生 新的") @GetMapping("/insertUserAndHelperSessionNew") public Result> insertUserAndHelperSessionNew() { diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/service/impl/ConHelperApiServiceImpl.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/service/impl/ConHelperApiServiceImpl.java index 380e420..114fede 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/service/impl/ConHelperApiServiceImpl.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/service/impl/ConHelperApiServiceImpl.java @@ -47,7 +47,7 @@ public class ConHelperApiServiceImpl implements ConHelperApiService { String helperUser = this.selectHelperUser(); if (StringUtils.isEmpty(helperUser)) { - return Result.error("暂无小助手在线"); + return Result.error("暂无全科医生在线"); } return Result.ok(helperUser); @@ -58,7 +58,7 @@ public class ConHelperApiServiceImpl implements ConHelperApiService { ConHelper conHelper = conHelperMapper.selectConHelperbyId(helpId); if(conHelper == null){ - return Result.error("小助手不存在"); + return Result.error("全科医生不存在"); } conHelper.setUserName("全科医生"); ConHelperCustomUserVO conHelperCustomUserVO = new ConHelperCustomUserVO(); diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/service/impl/ConSessionApiServiceImpl.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/service/impl/ConSessionApiServiceImpl.java index d91b08b..79dddc5 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/service/impl/ConSessionApiServiceImpl.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/service/impl/ConSessionApiServiceImpl.java @@ -260,12 +260,12 @@ public class ConSessionApiServiceImpl implements ConSessionApiService { String helpUser = conHelperApiServiceImpl.selectHelperUser(); if (StrUtil.isEmpty(helpUser)) { - return Result.error("小助手不存在,无法预约"); + return Result.error("全科医生不存在,无法预约"); } ConHelper conHelper = conHelperMapper.selectById(helpUser); if (conHelper == null) { - return Result.error("小助手不存在,无法预约"); + return Result.error("全科医生不存在,无法预约"); } @@ -394,7 +394,7 @@ public class ConSessionApiServiceImpl implements ConSessionApiService { } //如果是用户咨询全科医生 并且是青海 if (StrUtil.equals(conSession.getSessionType(), "2")) { - //如果用户发验 并且小助手在休息时间 那么自动发送消息 + //如果用户发验 并且全科医生在休息时间 那么自动发送消息 this.helperSendMessage(conSession.getImId(), fromAccount, conSession.getToAccount()); } @@ -1275,7 +1275,7 @@ public class ConSessionApiServiceImpl implements ConSessionApiService { String helper = conHelperApiServiceImpl.selectHelperUser(); if (StrUtil.isEmpty(helper)) { - return Result.error("暂无小助手可以服务"); + return Result.error("暂无全科医生可以服务"); } List yesIds = new ArrayList<>(); @@ -1367,12 +1367,12 @@ public class ConSessionApiServiceImpl implements ConSessionApiService { String helper = conHelperApiServiceImpl.selectHelperUser(); if (StrUtil.isEmpty(helper)) { - return Result.error("暂无小助手可以服务"); + return Result.error("暂无全科医生可以服务"); } ConHelper conHelper = conHelperMapper.selectById(helper); if (conHelper == null) { - return Result.error("暂无小助手可以服务"); + return Result.error("暂无全科医生可以服务"); } List yesIds = new ArrayList<>(); diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/async/AsyncExportService.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/async/AsyncExportService.java index 5a78ad6..29e8a62 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/async/AsyncExportService.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/async/AsyncExportService.java @@ -334,7 +334,7 @@ public class AsyncExportService { ConSession conSession = new ConSession(); BeanUtils.copyProperties(dto, conSession); LambdaQueryWrapper sessionWrapper = new LambdaQueryWrapper<>(); - // 只查询员工咨询小助手的数据 + // 只查询员工咨询全科医生的数据 sessionWrapper.eq(ConSession::getSessionType, "2"); sessionWrapper.and( p -> p.eq(ConSession::getTfReply, TF_REPLY_TRUE) @@ -415,7 +415,7 @@ public class AsyncExportService { if (CollUtil.isNotEmpty(conSessionList)) { // 取出用户的id List userIdList = conSessionList.stream().map(ConSession::getFromAccount).distinct().collect(Collectors.toList()); - // 取出小助手的id + // 取出全科医生的id List helpIdList = conSessionList.stream().map(ConSession::getToAccount).distinct().collect(Collectors.toList()); // 查询用户信息 diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConHelperController.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConHelperController.java index e717d5e..24786fd 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConHelperController.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConHelperController.java @@ -38,7 +38,7 @@ import java.util.List; * @Date: 2023-05-24 * @Version: V1.0 */ -@Tag(name = "consult/健康咨询/小助手管理") +@Tag(name = "consult/健康咨询/全科医生管理") @RestController @RequestMapping("/conHelper") @Slf4j @@ -68,10 +68,10 @@ public class ConHelperController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, ConHelper.class); } /** - * 小助手排班人员选择 + * 全科医生排班人员选择 * * @return */ @RequestMapping(value = "/getHelperIds") - @Operation(summary = "小助手排班人员选择") + @Operation(summary = "全科医生排班人员选择") public Result> getHelperIds() { return Result.OK(conHelperService.getHelperIds()); } /** - * 获取当前可用小助手 + * 获取当前可用全科医生 * * @return */ diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConHelperOnlineController.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConHelperOnlineController.java index 4e07b42..012360e 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConHelperOnlineController.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConHelperOnlineController.java @@ -27,7 +27,7 @@ import java.util.Arrays; * @Date: 2023-05-23 * @Version: V1.0 */ -@Tag(name = "consult/健康咨询/小助手管理/班次") +@Tag(name = "consult/健康咨询/全科医生管理/班次") @RestController @RequestMapping("/conHelperOnline") @Slf4j diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConHelperSchedulingController.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConHelperSchedulingController.java index 0a0a832..21c6506 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConHelperSchedulingController.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConHelperSchedulingController.java @@ -27,7 +27,7 @@ import java.util.List; * @Date: 2023-05-23 * @Version: V1.0 */ -@Tag(name = "consult/健康咨询/小助手管理/全部排班") +@Tag(name = "consult/健康咨询/全科医生管理/全部排班") @RestController @RequestMapping("/conHelperScheduling") @Slf4j @@ -36,24 +36,24 @@ public class ConHelperSchedulingController extends JeecgController> list() { return Result.OK(conHelperSchedulingService.listCustom()); } /** - * 小助手修改排班 + * 全科医生修改排班 * * @return */ - @Operation(summary = "小助手修改排班", description = "小助手修改排班") + @Operation(summary = "全科医生修改排班", description = "全科医生修改排班") @PostMapping("/updateHelperCustom") - @AutoLog(value = "小助手修改排班") + @AutoLog(value = "全科医生修改排班") public Result> updateHelperCustom(@RequestBody @Validated ConHelperCustomDTO dto) { boolean result = conHelperSchedulingService.updateScheduleDefault(dto); if (result) { @@ -68,7 +68,7 @@ public class ConHelperSchedulingController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, ConHelperScheduling.class); } - @Operation(summary = "员工图文咨询选择小助手接口") + @Operation(summary = "员工图文咨询选择全科医生接口") @GetMapping(value = "/chooseHelper") public Result chooseHelper() { return Result.error(conHelperSchedulingService.chooseHelper()); diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConHelperSchedulingHistoryController.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConHelperSchedulingHistoryController.java index 3e92787..bf2536c 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConHelperSchedulingHistoryController.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConHelperSchedulingHistoryController.java @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse; * @Date: 2023-08-24 * @Version: V1.0 */ -@Tag(name = "consult/健康咨询/小助手管理/历史排班") +@Tag(name = "consult/健康咨询/全科医生管理/历史排班") @RestController @RequestMapping("/consultation/conHelperSchedulingHistory") @Slf4j @@ -39,7 +39,7 @@ public class ConHelperSchedulingHistoryController extends JeecgController> queryPageList(ConHelperSchedulingHistoryDTO dto) { Page page = new Page(dto.getPageNo(), dto.getPageSize()); diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConSessionController.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConSessionController.java index acfde11..2d6b3ee 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConSessionController.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConSessionController.java @@ -75,7 +75,7 @@ public class ConSessionController extends JeecgController> listByHelper(SessionFilter filter) { return Result.OK(conSessionService.listByHelper(filter)); @@ -339,7 +339,7 @@ public class ConSessionController extends JeecgController saveReadLog(@RequestBody @Valid ImMsgReadLogVO imMsgReadLogVO) { + return Result.OK(imMsgReadLogService.saveReadLog(imMsgReadLogVO)); + } + + @PostMapping("/findReadStatus") + @Operation(summary = "查询消息是否已读", description = "查询消息是否已读(暂时只支持查询自定义消息类型的已读记录-医生名片)") + public Result> findReadStatus(List msgIdList) { + return Result.OK(imMsgReadLogService.findReadStatus(msgIdList)); + } +} diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/data/model/vo/ConsultationDataPageVO.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/data/model/vo/ConsultationDataPageVO.java index bb24d18..b1b9dab 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/data/model/vo/ConsultationDataPageVO.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/data/model/vo/ConsultationDataPageVO.java @@ -33,9 +33,9 @@ public class ConsultationDataPageVO { @Schema(title = "咨询方式:1图文聊天2音视频3电话4应急") private String contentType; /** - * 1专家2小助手 + * 1专家2全科医生 */ - @Schema(title = "咨询类型1员工咨询专家2员工咨询小助手3专家咨询小助手") + @Schema(title = "咨询类型1员工咨询专家2员工咨询全科医生3专家咨询全科医生") @Dict(dicCode = "con_type") private String sessionType; /** @@ -54,12 +54,12 @@ public class ConsultationDataPageVO { @Schema(title = "发起者姓名") private String fromName; /** - * 接受者姓名(可能是专家姓名 也可能是小助手名称) + * 接受者姓名(可能是专家姓名 也可能是全科医生名称) */ @Schema(title = "接受者姓名") private String toName; /** - * 员工单位 当咨询类型是1员工咨询专家2员工咨询小助手有值 + * 员工单位 当咨询类型是1员工咨询专家2员工咨询全科医生有值 */ @Schema(title = "员工单位") @DBColumnInfo(commonName = DbColumnNameEnum.USER_ORG) @@ -75,7 +75,7 @@ public class ConsultationDataPageVO { @Schema(title = "员工部门Code") private String employeeDeptCode; /** - * 员工部门 当咨询类型是1员工咨询专家2员工咨询小助手有值 + * 员工部门 当咨询类型是1员工咨询专家2员工咨询全科医生有值 */ @Schema(title = "员工部门") @DBColumnInfo(commonName = DbColumnNameEnum.USER_DEPT) diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/ConSessionMapper.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/ConSessionMapper.java index cbd208e..1b8cad1 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/ConSessionMapper.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/ConSessionMapper.java @@ -39,7 +39,7 @@ public interface ConSessionMapper extends BaseMapper , MPJBaseMapper /** - * 分页列表查询(小助手专用) + * 分页列表查询(全科医生专用) * * @param page 分页参数 * @param conSession 查询参数 @@ -174,7 +174,7 @@ public interface ConSessionMapper extends BaseMapper , MPJBaseMapper /** - * 小助手 超过四小时不回复就完成 + * 全科医生 超过四小时不回复就完成 * * @return */ diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/ImMsgReadLogMapper.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/ImMsgReadLogMapper.java new file mode 100644 index 0000000..98d4f46 --- /dev/null +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/ImMsgReadLogMapper.java @@ -0,0 +1,9 @@ +package com.renkang.consultation.mapper; + +import com.github.yulichang.base.MPJBaseMapper; +import com.renkang.consultation.entity.ImMsgReadLog; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ImMsgReadLogMapper extends MPJBaseMapper { +} diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/IConHelperSchedulingService.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/IConHelperSchedulingService.java index ca98e50..3347fae 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/IConHelperSchedulingService.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/IConHelperSchedulingService.java @@ -20,14 +20,14 @@ public interface IConHelperSchedulingService extends IService listCustom(); /** - * 小助手修改排班 + * 全科医生修改排班 * * @return */ diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/IConHelperService.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/IConHelperService.java index 6b53f96..aed0a9e 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/IConHelperService.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/IConHelperService.java @@ -23,7 +23,7 @@ public interface IConHelperService extends IService { /** * 添加 * - * @param conHelperExAndUser 小助手信息及用户基础信息 + * @param conHelperExAndUser 全科医生信息及用户基础信息 * @return */ Result saveHelperUser(ConHelperExAndUser conHelperExAndUser); @@ -31,13 +31,13 @@ public interface IConHelperService extends IService { /** * 编辑 * - * @param conHelperExAndUser 小助手信息及用户基础信息 + * @param conHelperExAndUser 全科医生信息及用户基础信息 * @return */ Result updateByHelperUser(ConHelperExAndUser conHelperExAndUser); /** - * 小助手排班人员选择 + * 全科医生排班人员选择 * * @return */ @@ -55,7 +55,7 @@ public interface IConHelperService extends IService { /** * 通过id查询 * - * @param id 小助手id + * @param id 全科医生id * @return */ ConHelperExAndUser getByHelperUser(String id); diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/ImMsgReadLogService.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/ImMsgReadLogService.java new file mode 100644 index 0000000..9358c67 --- /dev/null +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/ImMsgReadLogService.java @@ -0,0 +1,22 @@ +package com.renkang.consultation.service; + +import com.renkang.consultation.vo.ImMsgReadLogVO; + +import java.util.List; +import java.util.Map; + +public interface ImMsgReadLogService { + /** + * 记录消息已读日志 + * @param imMsgReadLogVO + * @return + */ + String saveReadLog(ImMsgReadLogVO imMsgReadLogVO); + + /** + * 查询消息是否已读 + * @param msgIdList + * @return + */ + Map findReadStatus(List msgIdList); +} diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConHelperSchedulingServiceImpl.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConHelperSchedulingServiceImpl.java index 5ab2abd..36324af 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConHelperSchedulingServiceImpl.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConHelperSchedulingServiceImpl.java @@ -86,11 +86,11 @@ public class ConHelperSchedulingServiceImpl extends ServiceImpl conHelperList = new ArrayList<>(); diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConSessionServiceImpl.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConSessionServiceImpl.java index 6b7bba9..40b36f2 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConSessionServiceImpl.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConSessionServiceImpl.java @@ -447,9 +447,9 @@ public class ConSessionServiceImpl extends ServiceImpl wrapper = new MPJLambdaWrapper<>(); + wrapper.eq(ImMsgReadLog::getMsgId, imMsgReadLogVO.getMsgId()); + wrapper.eq(ImMsgReadLog::getGroupId, imMsgReadLogVO.getGroupId()); + ImMsgReadLog msgReadLog = imMsgReadLogMapper.selectOne(wrapper); + if(msgReadLog == null) { + msgReadLog = new ImMsgReadLog(); + msgReadLog.setGroupId(imMsgReadLogVO.getGroupId()); + msgReadLog.setMsgId(imMsgReadLogVO.getMsgId()); + msgReadLog.setReadTime(new Date()); + msgReadLog.setToAccount(imMsgReadLogVO.getToAccount()); + msgReadLog.setFromAccount(imMsgReadLogVO.getFromAccount()); + msgReadLog.setReadCount(1); + imMsgReadLogMapper.insert(msgReadLog); + }else { + //因为目前用于医生名片的已读且只能点一次,暂时这样提示 + ExceptionAssertsUtil.fail("医生名片已失效"); + } + return "操作成功"; + } + + @Override + public Map findReadStatus(List msgIdList) { + Map map = new HashMap<>(); + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.in(ImMsgReadLog::getMsgId, msgIdList); + Map logMap = imMsgReadLogMapper.selectList(wrapper).stream() + .collect(Collectors.toMap(ImMsgReadLog::getMsgId, x -> x)); + for (String msgId : msgIdList) { + ImMsgReadLog log = logMap.get(msgId); + if(log == null) { + map.put(msgId, 0); + }else { + map.put(msgId, log.getReadCount()); + } + } + return map; + } +} diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/task/HelperSchedulingHistoryJob.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/task/HelperSchedulingHistoryJob.java index 7c88bdc..7e978c6 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/task/HelperSchedulingHistoryJob.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/task/HelperSchedulingHistoryJob.java @@ -36,8 +36,8 @@ public class HelperSchedulingHistoryJob { String clientSign = jsonObject.getString("clientSign"); ClientSignThreadLocal.setClientSign(clientSign); - XxlJobHelper.log("开始记录小助手排班历史"); - log.info("开始记录小助手排班历史"); + XxlJobHelper.log("开始记录全科医生排班历史"); + log.info("开始记录全科医生排班历史"); try { //获取昨天的日期 Date yesterday = DateUtils.dateAddDay(new Date(), -1); @@ -53,12 +53,12 @@ public class HelperSchedulingHistoryJob { historyList.add(history); }); historyService.saveBatch(historyList); - XxlJobHelper.log("结束记录小助手排班历史"); - log.info("结束记录小助手排班历史"); + XxlJobHelper.log("结束记录全科医生排班历史"); + log.info("结束记录全科医生排班历史"); return ReturnT.SUCCESS; } catch (Exception e) { - XxlJobHelper.log("记录小助手排班历史失败"); - log.error("记录小助手排班历史失败", e); + XxlJobHelper.log("记录全科医生排班历史失败"); + log.error("记录全科医生排班历史失败", e); return ReturnT.FAIL; } } diff --git a/health-im/health-im-biz/src/main/java/com/renkang/im/controller/TXController.java b/health-im/health-im-biz/src/main/java/com/renkang/im/controller/TXController.java index d39dc6e..705b80f 100644 --- a/health-im/health-im-biz/src/main/java/com/renkang/im/controller/TXController.java +++ b/health-im/health-im-biz/src/main/java/com/renkang/im/controller/TXController.java @@ -262,7 +262,7 @@ public class TXController { String personType = loginUser.getPersonType(); String aa = ""; /* if (StringUtils.equals(personType, "2")) { - aa = "(小助手)"; + aa = "(全科医生)"; }*/ if (StringUtils.equals(personType, "3")) { aa = "(专家)"; @@ -302,7 +302,7 @@ public class TXController { String personType = loginUser.getPersonType(); String aa = ""; /* if (StringUtils.equals(personType, "2")) { - aa = "(小助手)"; + aa = "(全科医生)"; }*/ if (StringUtils.equals(personType, "3")) { aa = "(专家)"; diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java index 244de63..9960353 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java @@ -570,10 +570,10 @@ public class WatchDataServiceImpl extends ServiceImpl ObjectUtil.isNotNull(f.getMinValue())) .mapToInt(WatchStatUserInfoDayHeartRate::getMinValue).min().orElse(0); // 和 - int sum = list.stream() - .filter(f -> ObjectUtil.isNotNull(f.getAvgValue())) - .mapToInt(WatchStatUserInfoDayHeartRate::getAvgValue).sum(); - + List heartRateList = list.stream() + .filter(f -> ObjectUtil.isNotNull(f.getAvgValue()) && f.getAvgValue() > 0) + .collect(Collectors.toList()); + int sum = heartRateList.stream().mapToInt(WatchStatUserInfoDayHeartRate::getAvgValue).sum(); // 最大值 int skinMax = list.stream() .filter(f -> ObjectUtil.isNotNull(f.getSilenceMaxValue())) @@ -583,17 +583,17 @@ public class WatchDataServiceImpl extends ServiceImpl ObjectUtil.isNotNull(f.getSilenceMinValue())) .mapToInt(WatchStatUserInfoDayHeartRate::getSilenceMinValue).min().orElse(0); // 和 - int skinSum = list.stream() - .filter(f -> ObjectUtil.isNotNull(f.getSilenceAvgValue())) - .mapToInt(WatchStatUserInfoDayHeartRate::getSilenceAvgValue).sum(); - + List silenceList = list.stream() + .filter(f -> ObjectUtil.isNotNull(f.getSilenceAvgValue()) && f.getSilenceAvgValue() > 0) + .collect(Collectors.toList()); + int skinSum = silenceList.stream().mapToInt(WatchStatUserInfoDayHeartRate::getSilenceAvgValue).sum(); stat.setMax(max); stat.setMin(min); - stat.setAvg((sum / list.size())); + stat.setAvg((sum / heartRateList.size())); stat.setSilenceMax(skinMax); stat.setSilenceMin(skinMin); - stat.setSilenceAvg(skinSum / list.size()); + stat.setSilenceAvg(skinSum / silenceList.size()); return stat; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserModel.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserModel.java index fbfbd86..6c37107 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserModel.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserModel.java @@ -142,10 +142,10 @@ public class SysUserModel { @Schema(title = "身份证") private String idCard; /** - * 人员类型 1:员工 2: 小助手 3: 专家 4: 医疗点 5: 操作人员 6: 专业人员 7:驻场人员 8:其他 9:医院管理员 + * 人员类型 1:员工 2: 全科医生 3: 专家 4: 医疗点 5: 操作人员 6: 专业人员 7:驻场人员 8:其他 9:医院管理员 * 10: 医院体检医生 11:医院前台 12: 健康室管理员 13: 健康打卡管理员 */ - @Schema(title = "人员类型", description = "1:员工 2: 小助手 3: 专家 4: 医疗点 5: 操作人员 6: 专业人员 7:驻场人员 8:其他 9:医院管理员 10: 医院体检医生 11:医院前台 12: 健康室管理员 13: 健康打卡管理员") + @Schema(title = "人员类型", description = "1:员工 2: 全科医生 3: 专家 4: 医疗点 5: 操作人员 6: 专业人员 7:驻场人员 8:其他 9:医院管理员 10: 医院体检医生 11:医院前台 12: 健康室管理员 13: 健康打卡管理员") @Dict(dicCode = "p_type") private String personType; diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysNotice.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysNotice.java index 969032e..2e7c43c 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysNotice.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysNotice.java @@ -66,10 +66,10 @@ public class SysNotice implements Serializable { @Schema(title = "发布状态(0未发布,1已发布,2已撤销)") private String sendStatus; /** - * 所属角色(1:员工 2: 小助手 3: 专家 4: 医疗点 5: 操作人员 6: 专业人员 7:驻场人员 8:其他 9:医院管理员 10: 医院体检医生 11:医院前台 12: 健康室管理员 13: 健康打卡管理员) + * 所属角色(1:员工 2: 全科医生 3: 专家 4: 医疗点 5: 操作人员 6: 专业人员 7:驻场人员 8:其他 9:医院管理员 10: 医院体检医生 11:医院前台 12: 健康室管理员 13: 健康打卡管理员) */ - @Excel(name = "所属角色(1:员工 2: 小助手 3: 专家 4: 医疗点 5: 操作人员 6: 专业人员 7:驻场人员 8:其他 9:医院管理员 10: 医院体检医生 11:医院前台 12: 健康室管理员 13: 健康打卡管理员)", width = 15) - @Schema(title = "所属角色(1:员工 2: 小助手 3: 专家 4: 医疗点 5: 操作人员 6: 专业人员 7:驻场人员 8:其他 9:医院管理员 10: 医院体检医生 11:医院前台 12: 健康室管理员 13: 健康打卡管理员)") + @Excel(name = "所属角色(1:员工 2: 全科医生 3: 专家 4: 医疗点 5: 操作人员 6: 专业人员 7:驻场人员 8:其他 9:医院管理员 10: 医院体检医生 11:医院前台 12: 健康室管理员 13: 健康打卡管理员)", width = 15) + @Schema(title = "所属角色(1:员工 2: 全科医生 3: 专家 4: 医疗点 5: 操作人员 6: 专业人员 7:驻场人员 8:其他 9:医院管理员 10: 医院体检医生 11:医院前台 12: 健康室管理员 13: 健康打卡管理员)") private String personType; /** * 发布时间