杭州七院核查获取自身病区医疗组接口调整

src/main/java/com/diagbot/facade/MedCheckWorkFacade.java

@@ -11,6 +11,7 @@ import com.diagbot.dto.MedoupDTO;
 import com.diagbot.dto.RegionDTO;
 import com.diagbot.dto.RegionMedoupDTO;
 import com.diagbot.entity.BasDoctorInfo;
+import com.diagbot.entity.DeptMedoup;
 import com.diagbot.entity.MedBehospitalType;
 import com.diagbot.entity.MedCheckInfo;
 import com.diagbot.entity.Medoup;
@@ -378,34 +379,42 @@ public class MedCheckWorkFacade {
         }
         regionMedoup.setMedoups(medoups);
         //获取当前用户的医疗组信息
-//        MedoupUser medoupUser = medoupUserService.getOne(new QueryWrapper<MedoupUser>()
-//                .eq("user_id", SysUserUtils.getCurrentPrincipleID())
-//                .eq("is_deleted", IsDeleteEnum.N.getKey()));
-//        if (medoupUser == null || medoupUser.getMedoupCode() == null) {
-//            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该用户无医疗组关联信息");
-//        }
-//        regionMedoup.setLocalMedoupCode(medoupUser.getMedoupCode());
+        List<String> userNames = sysUserFacade.list(new QueryWrapper<SysUser>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", SysUserUtils.getCurrentPrincipleID())
+        ).stream().map(SysUser::getUsername).collect(Collectors.toList());
+        if (ListUtil.isNotEmpty(userNames)) {
+            List<String> medoupTemps = medoupUserService.list(new QueryWrapper<BasDoctorInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("doctor_id", userNames)
+            ).stream().map(BasDoctorInfo::getGroupId).collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(medoups)) {
+                regionMedoup.setLocalMedoupCode(medoupTemps.get(0));
+            }
+        }
+
         return regionMedoup;
     }
 
     private List<MedoupDTO> getLocalMdeoup(List<BasDeptInfoDTO> selDepts) {
         List<MedoupDTO> medoups = new ArrayList<>();
         if (ListUtil.isNotEmpty(selDepts)) {
-//            List<String> deptIds = selDepts.stream().map(BasDeptInfoDTO::getDeptId).collect(Collectors.toList());
+            List<String> deptIds = selDepts.stream().map(BasDeptInfoDTO::getDeptId).collect(Collectors.toList());
             //获取本人科室关联的医疗组code
-//            List<DeptMedoup> deptMedoups = deptMedoupService.list(new QueryWrapper<DeptMedoup>()
-//                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-//                    .in("dept_id", deptIds));
-            List<String> medoupCodes = null;
-            List<String> doctorIds = sysUserFacade.list(new QueryWrapper<SysUser>()
+            List<DeptMedoup> deptMedoups = deptMedoupService.list(new QueryWrapper<DeptMedoup>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("id", SysUserUtils.getCurrentPrincipleID())
-            ).stream().map(SysUser::getUsername).collect(Collectors.toList());
-            if (ListUtil.isNotEmpty(doctorIds)) {
-                medoupCodes = medoupUserService.list(new QueryWrapper<BasDoctorInfo>()
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .in("doctor_id", doctorIds)
-                ).stream().map(BasDoctorInfo::getGroupId).collect(Collectors.toList());
+                    .in("dept_id", deptIds));
+            List<String> medoupCodes = null;
+//            List<String> doctorIds = sysUserFacade.list(new QueryWrapper<SysUser>()
+//                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+//                    .eq("id", SysUserUtils.getCurrentPrincipleID())
+//            ).stream().map(SysUser::getUsername).collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(deptMedoups)) {
+                medoupCodes = deptMedoups.stream().map(DeptMedoup::getMedoupCode).collect(Collectors.toList());
+//                medoupCodes = medoupUserService.list(new QueryWrapper<BasDoctorInfo>()
+//                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+//                        .in("doctor_id", doctorIds)
+//                ).stream().map(BasDoctorInfo::getGroupId).collect(Collectors.toList());
             }
 
             if (ListUtil.isNotEmpty(medoupCodes)) {

src/main/resources/application-test.yml

@@ -59,7 +59,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://192.168.2.237:3306/qc_qiyuan?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
       password: lantone
       # 连接池的配置信息