修改群内bug

health-consultation/health-consultation-api/src/main/java/com/renkang/consultation/vo/ConDoctorVO.java

@@ -58,7 +58,7 @@ public class ConDoctorVO {
     private String doctorStatus;
 
     @Excel(name = "医生是否开启咨询(z_doct_sta(1:开启 3:关闭))", width = 15)
-    @Dict(dicCode = "doc_accept_flag")
+    @Dict(dicCode = "z_doct_sta")
     @Schema(title = "医生是否开启咨询(z_doct_sta(1:开启 3:关闭))")
     private String isAccept;
 

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConDoctorCardController.java

@@ -1,5 +1,6 @@
 package com.renkang.consultation.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.renkang.consultation.entity.ConDoctorCard;
@@ -62,6 +63,12 @@ public class ConDoctorCardController extends JeecgController<ConDoctorCard, ICon
 //    @RequiresPermissions("consultation:con_doctor_card:add")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody ConDoctorCard conDoctorCard) {
+        if (StrUtil.isEmpty(conDoctorCard.getCardMsg())){
+            return Result.error("请填写开户行");
+        }
+        if (StrUtil.isEmpty(conDoctorCard.getCardNum())){
+            return Result.error("请填写银行卡号");
+        }
         conDoctorCard.setCreateTime(new Date());
         conDoctorCardService.save(conDoctorCard);
         return Result.OK("添加成功！");

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConFamilyMembersMapper.xml

@@ -26,7 +26,7 @@
             #{item}
         </foreach>
         )
-        and status = 1 and del_flag = 0
+        and status = 1 and del_flag = 0 and family_relation != '1'
         GROUP BY group_id
     </select>
     <select id="selectFamilyGroupId" parameterType="list" resultType="com.renkang.consultation.vo.ConFamilyNumVO">

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConDoctorServiceImpl.java

@@ -150,7 +150,7 @@ public class ConDoctorServiceImpl extends ServiceImpl<ConDoctorMapper, ConDoctor
             conDoctor.setDoctorTitle(dto.getDoctorTitle());
         }
         // 通过Mapper查询并获取分页数据
-        if (dto.getDepartmentId() != null && !"".equals(dto.getDepartmentId())) {
+        if (dto.getDepartmentId() != null && !dto.getDepartmentId().isEmpty()) {
             //查询出当前科室
             ConDepartment conDepartment = conDepartmentMapper.selectById(dto.getDepartmentId());
             List<ConDepartment> departments = new ArrayList<>();

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConHealthInfoAnswerServiceImpl.java

@@ -1,5 +1,6 @@
 package com.renkang.consultation.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -131,7 +132,7 @@ public class ConHealthInfoAnswerServiceImpl extends ServiceImpl<ConHealthInfoAns
             List<ConSession> conSessions1 = collect.get(item.getFromAccount());
             List<String> collect1 = conSessions1.stream()
                     .map(ConSession::getMemberId)
-                    .filter(memberId -> memberId != null && !memberId.isEmpty())
+                    .filter(memberId -> memberId != null && !memberId.isEmpty()).distinct()
                     .collect(Collectors.toList());
             item.setMemberIds(collect1);
         });
@@ -215,10 +216,13 @@ public class ConHealthInfoAnswerServiceImpl extends ServiceImpl<ConHealthInfoAns
                 vo.setWorkNo(loginUserNew.getWorkNo());
 
             }
-            if (item.getGroupId() != null && !"".equals(item.getGroupId())) {
-                Integer count = Objects.requireNonNull(finalConFamilyNumVOList.stream()
-                        .filter(ite -> ite.getGroupId().equals(item.getGroupId())).findFirst().orElse(null)).getCount();
-                vo.setFamilyNum(count);
+            if (item.getGroupId() != null && !item.getGroupId().isEmpty()) {
+                if (CollUtil.isNotEmpty(finalConFamilyNumVOList)){
+                    ConFamilyNumVO conFamilyNumVO = finalConFamilyNumVOList.stream().filter(ite -> ite.getGroupId().equals(item.getGroupId())).findFirst().orElse(null);
+                    if (conFamilyNumVO != null) {
+                        vo.setFamilyNum(conFamilyNumVO.getCount());
+                    }
+                }
             }
             vo.setId(item.getId());
             voList.add(vo);