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

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

@@ -46,15 +46,15 @@ public class MedicalEquipmentController {
 	@PostMapping
 	public R<?> save(@Validated(BaseEntity.Create.class) @RequestBody MedicalEquipment medicalEquipment) {
 		int count = medicalEquipmentService.count(Wrappers.<MedicalEquipment>lambdaQuery()
-				.eq(MedicalEquipment::getDeptId, medicalEquipment.getDeptId())
+				.eq(MedicalEquipment::getDrugEntId, medicalEquipment.getDrugEntId())
 				.eq(MedicalEquipment::getName, medicalEquipment.getName()));
 		if (count > 0) {
 			return R.failed("所属企业下已存在");
 		}
 
-		SysDept sysDept = sysDeptService.getById(medicalEquipment.getDeptId());
+		SysDept sysDept = sysDeptService.getById(medicalEquipment.getDrugEntId());
 		if (sysDept != null) {
-			medicalEquipment.setDeptName(sysDept.getName());
+			medicalEquipment.setDrugEntName(sysDept.getName());
 		}
 
 		medicalEquipmentService.save(medicalEquipment);
@@ -70,16 +70,16 @@ public class MedicalEquipmentController {
 	@PutMapping
 	public R<?> update(@Validated(BaseEntity.Update.class) @RequestBody MedicalEquipment medicalEquipment) {
 		int count = medicalEquipmentService.count(Wrappers.<MedicalEquipment>lambdaQuery()
-				.eq(MedicalEquipment::getDeptId, medicalEquipment.getDeptId())
+				.eq(MedicalEquipment::getDrugEntId, medicalEquipment.getDrugEntId())
 				.eq(MedicalEquipment::getName, medicalEquipment.getName())
 				.ne(MedicalEquipment::getId, medicalEquipment.getId()));
 		if (count > 0) {
 			return R.failed("所属企业下已存在");
 		}
 
-		SysDept sysDept = sysDeptService.getById(medicalEquipment.getDeptId());
+		SysDept sysDept = sysDeptService.getById(medicalEquipment.getDrugEntId());
 		if (sysDept != null) {
-			medicalEquipment.setDeptName(sysDept.getName());
+			medicalEquipment.setDrugEntName(sysDept.getName());
 		}
 
 		medicalEquipmentService.updateById(medicalEquipment);
@@ -114,8 +114,8 @@ public class MedicalEquipmentController {
 		if (StrUtil.isNotBlank(medicalEquipment.getManufacturer())) {
 			queryWrapper.like(MedicalEquipment::getManufacturer, medicalEquipment.getManufacturer());
 		}
-		if (StrUtil.isNotBlank(medicalEquipment.getDeptName())) {
-			queryWrapper.like(MedicalEquipment::getDeptName, medicalEquipment.getDeptName());
+		if (StrUtil.isNotBlank(medicalEquipment.getDrugEntName())) {
+			queryWrapper.like(MedicalEquipment::getDrugEntName, medicalEquipment.getDrugEntName());
 		}
 		Page<MedicalEquipment> equipmentPage = medicalEquipmentService.page(page, queryWrapper);
 		return R.ok(equipmentPage);

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

@@ -29,6 +29,6 @@ public class MedicalEquipmentServiceImpl extends ServiceImpl<MedicalEquipmentMap
 	public List<MedicalEquipment> listByDrugId(Integer deptId) {
 
 		return this.list(Wrappers.<MedicalEquipment>lambdaQuery()
-				.eq(MedicalEquipment::getDeptId, deptId));
+				.eq(MedicalEquipment::getDrugEntId, deptId));
 	}
 }