Merge remote-tracking branch 'origin/develop' into develop

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

@@ -20,6 +20,9 @@ public class ConDoctorUserVO {
     @Schema(title = "用户账号")
     private String username;
 
+    @Schema(title = "用户姓名")
+    private String realname;
+
     @Schema(title = "用户密码")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private String password;

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

@@ -3,6 +3,7 @@ package com.renkang.consultation.controller;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,6 +16,7 @@ import com.renkang.consultation.dto.ConDoctorDTO;
 import com.renkang.consultation.dto.DoctorAudioStatusDTO;
 import com.renkang.consultation.dto.DoctorJumpHolidayDTO;
 import com.renkang.consultation.entity.*;
+import com.renkang.consultation.mapper.ConDepartmentMapper;
 import com.renkang.consultation.mapper.ConResourceMapper;
 import com.renkang.consultation.mapper.ESConDoctorMapper;
 import com.renkang.consultation.service.IConDepartmentService;
@@ -81,6 +83,8 @@ public class ConDoctorController extends JeecgController<ConDoctor, IConDoctorSe
     private ConResourceMapper conResourceMapper;
     @Autowired
     private DictUtil dictUtil;
+    @Autowired
+    private ConDepartmentMapper conDepartmentMapper;
 
     /**
      * 分页列表查询
@@ -486,8 +490,9 @@ public class ConDoctorController extends JeecgController<ConDoctor, IConDoctorSe
 
                     String name = getCellStringValue(row.getCell(0));
                     doctorVO.setDoctorName(name);
+                    userVO.setRealname(name);
                     String account = getCellStringValue(row.getCell(1));
-                    userVO.setUsername(name);
+                    userVO.setUsername(account);
                     String password = getCellStringValue(row.getCell(2));
                     String g = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmZfR/bA9X3vp86y1aEpvwzXJYKRRF1fLau2+05/ZtaITLpV8bhkmSf3neSy/Q9gAdvG75Fr73E+GWE+K5b0BpvIS1jDGo319+PpZR39SaZTKZ27XFXrosmJTZutN79t819HS1VseleunHAFgMVufE9U5jP6LGzl/wbkSy01GhzwIDAQAB";
                     String cipherText = RSAEncryptUtils.encrypt1(password, g);
@@ -531,6 +536,15 @@ public class ConDoctorController extends JeecgController<ConDoctor, IConDoctorSe
                                 doctorVO.setResourceId(conResource.getId());
                             }
                         }
+                        String departmentName = getCellStringValue(row.getCell(5));
+                        List<ConDepartment> conDepartments = conDepartmentMapper.selectListByName(departmentName);
+                        if (conDepartments != null && !conDepartments.isEmpty()) {
+                            ConDepartment conDepartment = conDepartments.get(0);
+                            if (conDepartment != null) {
+                                doctorVO.setDepartmentId(conDepartment.getId());
+                                doctorVO.setDepartmentName(departmentName);
+                            }
+                        }
 
                         String zc = getCellStringValue(row.getCell(6));
                         List<DictModel> models = dictUtil.queryDictItemListByCode("z_doct_lev");