feat: 医疗器械查询逻辑调整

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/MedicalEquipmentController.java

@@ -4,15 +4,12 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRelation;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.entity.MedicalEquipment;
-import com.qunzhixinxi.hnqz.admin.entity.WmDaDrugEnt;
 import com.qunzhixinxi.hnqz.admin.entity.base.BaseEntity;
 import com.qunzhixinxi.hnqz.admin.service.MedicalEquipmentService;
-import com.qunzhixinxi.hnqz.admin.service.SysDeptRelationService;
-import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
-import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
@@ -25,9 +22,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Collections;
-import java.util.List;
-
 /**
  * @author: lixuesong
  * @createTime: 2022/11/08 10:07
@@ -41,9 +35,7 @@ public class MedicalEquipmentController {
 
 	private final MedicalEquipmentService medicalEquipmentService;
 
-	private final WmDaDrugEntService wmDaDrugEntService;
-
-	private final SysDeptRelationService sysDeptRelationService;
+	private final SysDeptService sysDeptService;
 
 	/**
 	 * 新增
@@ -54,11 +46,17 @@ public class MedicalEquipmentController {
 	@PostMapping
 	public R<?> save(@Validated(BaseEntity.Create.class) @RequestBody MedicalEquipment medicalEquipment) {
 		int count = medicalEquipmentService.count(Wrappers.<MedicalEquipment>lambdaQuery()
-				.eq(MedicalEquipment::getDrugEntId, medicalEquipment.getDrugEntId())
+				.eq(MedicalEquipment::getDeptId, medicalEquipment.getDeptId())
 				.eq(MedicalEquipment::getName, medicalEquipment.getName()));
 		if (count > 0) {
 			return R.failed("所属企业下已存在");
 		}
+
+		SysDept sysDept = sysDeptService.getById(medicalEquipment.getDeptId());
+		if (sysDept != null) {
+			medicalEquipment.setDeptName(sysDept.getName());
+		}
+
 		medicalEquipmentService.save(medicalEquipment);
 		return R.ok();
 	}
@@ -72,12 +70,18 @@ public class MedicalEquipmentController {
 	@PutMapping
 	public R<?> update(@Validated(BaseEntity.Update.class) @RequestBody MedicalEquipment medicalEquipment) {
 		int count = medicalEquipmentService.count(Wrappers.<MedicalEquipment>lambdaQuery()
-				.eq(MedicalEquipment::getDrugEntId, medicalEquipment.getDrugEntId())
+				.eq(MedicalEquipment::getDeptId, medicalEquipment.getDeptId())
 				.eq(MedicalEquipment::getName, medicalEquipment.getName())
 				.ne(MedicalEquipment::getId, medicalEquipment.getId()));
 		if (count > 0) {
 			return R.failed("所属企业下已存在");
 		}
+
+		SysDept sysDept = sysDeptService.getById(medicalEquipment.getDeptId());
+		if (sysDept != null) {
+			medicalEquipment.setDeptName(sysDept.getName());
+		}
+
 		medicalEquipmentService.updateById(medicalEquipment);
 		return R.ok();
 	}
@@ -110,8 +114,8 @@ public class MedicalEquipmentController {
 		if (StrUtil.isNotBlank(medicalEquipment.getManufacturer())) {
 			queryWrapper.like(MedicalEquipment::getManufacturer, medicalEquipment.getManufacturer());
 		}
-		if (StrUtil.isNotBlank(medicalEquipment.getDrugEntName())) {
-			queryWrapper.like(MedicalEquipment::getDrugEntName, medicalEquipment.getDrugEntName());
+		if (StrUtil.isNotBlank(medicalEquipment.getDeptName())) {
+			queryWrapper.like(MedicalEquipment::getDeptName, medicalEquipment.getDeptName());
 		}
 		Page<MedicalEquipment> equipmentPage = medicalEquipmentService.page(page, queryWrapper);
 		return R.ok(equipmentPage);

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/MedicalEquipment.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
+
 import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -14,7 +14,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -45,15 +44,17 @@ public class MedicalEquipment extends Model<MedicalEquipment> {
     private String manufacturer;
 
     /**
-     * 所属企业id
+     * 所属企业id（这里改存药企或CSO的deptId）
      */
 	@NotNull(message = "所属企业id不能为空", groups = BaseEntity.Create.class)
-    private Integer drugEntId;
+	@TableField("drug_ent_id")
+    private Integer deptId;
 
     /**
      * 所属企业名称
      */
-    private String drugEntName;
+	@TableField("drug_ent_name")
+    private String deptName;
 
     /**
      * 规格

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/MedicalEquipmentServiceImpl.java

@@ -2,18 +2,12 @@ package com.qunzhixinxi.hnqz.admin.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRelation;
 import com.qunzhixinxi.hnqz.admin.entity.MedicalEquipment;
-import com.qunzhixinxi.hnqz.admin.entity.WmDaDrugEnt;
 import com.qunzhixinxi.hnqz.admin.mapper.MedicalEquipmentMapper;
 import com.qunzhixinxi.hnqz.admin.service.MedicalEquipmentService;
-import com.qunzhixinxi.hnqz.admin.service.SysDeptRelationService;
-import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
-import com.qunzhixinxi.hnqz.common.core.util.R;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -26,10 +20,6 @@ import java.util.List;
 public class MedicalEquipmentServiceImpl extends ServiceImpl<MedicalEquipmentMapper, MedicalEquipment>
 		implements MedicalEquipmentService {
 
-	private final WmDaDrugEntService wmDaDrugEntService;
-
-	private final SysDeptRelationService sysDeptRelationService;
-
 	/**
 	 * 查询指定企业对应的医疗器械
 	 *
@@ -37,32 +27,8 @@ public class MedicalEquipmentServiceImpl extends ServiceImpl<MedicalEquipmentMap
 	 * @return
 	 */
 	public List<MedicalEquipment> listByDrugId(Integer deptId) {
-		// 查询父级企业id
-		SysDeptRelation deptRelation = sysDeptRelationService.getOne(Wrappers.<SysDeptRelation>lambdaQuery()
-				.eq(SysDeptRelation::getDescendant, deptId)
-				.ne(SysDeptRelation::getAncestor, deptId));
-		if (deptRelation == null) {
-			return Collections.emptyList();
-		}
-		// Ancestor() != 1 表明不是第一级的药企
-		if (deptRelation.getAncestor() != 1) {
-			// 查询是否存在父级的父级
-			SysDeptRelation pDeptRelation = sysDeptRelationService.getOne(Wrappers.<SysDeptRelation>lambdaQuery()
-					.eq(SysDeptRelation::getDescendant, deptRelation.getAncestor())
-					.ne(SysDeptRelation::getAncestor, deptRelation.getAncestor()));
-			if (pDeptRelation != null && pDeptRelation.getAncestor() == 1) {
-				deptRelation = pDeptRelation;
-			}
-		}
-
-		// 查询企业对应药企id
-		WmDaDrugEnt wmDaDrugEnt = wmDaDrugEntService.selectByDeptId(deptRelation.getDescendant());
-
-		if (wmDaDrugEnt == null) {
-			return Collections.emptyList();
-		}
 
 		return this.list(Wrappers.<MedicalEquipment>lambdaQuery()
-				.eq(MedicalEquipment::getDrugEntId, wmDaDrugEnt.getId()));
+				.eq(MedicalEquipment::getDeptId, deptId));
 	}
 }