feat(controller): 调查信息审核-根据id查询修改

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

@@ -22,23 +22,32 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDictItem;
+import com.qunzhixinxi.hnqz.admin.entity.WmDaDistribution;
 import com.qunzhixinxi.hnqz.admin.entity.WmTask;
 import com.qunzhixinxi.hnqz.admin.entity.WmTaskContent;
+import com.qunzhixinxi.hnqz.admin.service.SysDictItemService;
+import com.qunzhixinxi.hnqz.admin.service.WmDaDistributionService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaHospitalService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskContentService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
 import com.qunzhixinxi.hnqz.admin.util.MapUtil;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
-import com.qunzhixinxi.hnqz.admin.entity.WmDaDistribution;
-import com.qunzhixinxi.hnqz.admin.service.WmDaDistributionService;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -65,6 +74,8 @@ public class WmDaDistributionController {
 
 	private final WmTaskContentService wmTaskContentService;
 
+	private final SysDictItemService sysDictItemService;
+
 	/**
 	 * 分页查询
 	 *
@@ -123,7 +134,17 @@ public class WmDaDistributionController {
 	@ApiOperation(value = "通过id查询", notes = "通过id查询")
 	@GetMapping("/{id}")
 	public R getById(@PathVariable("id") Integer id) {
-		return R.ok(wmDaDistributionService.getById(id));
+		WmDaDistribution distribution = wmDaDistributionService.getById(id);
+		// 设置药品信息化追溯体系名称
+		if (distribution != null && StringUtils.isNotBlank(distribution.getMedicineTraceability())) {
+			SysDictItem medicineTraceabilityDict = sysDictItemService.getOne(Wrappers.<SysDictItem>lambdaQuery()
+					.eq(SysDictItem::getType, "medicine_traceability")
+					.eq(SysDictItem::getValue, distribution.getMedicineTraceability()));
+			if (medicineTraceabilityDict != null) {
+				distribution.setMedicineTraceabilityName(medicineTraceabilityDict.getLabel());
+			}
+		}
+		return R.ok(distribution);
 	}
 
 	/**

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

@@ -17,6 +17,7 @@
 
 package com.qunzhixinxi.hnqz.admin.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -219,6 +220,13 @@ public class WmDaDistribution extends Model<WmDaDistribution> {
 	@ApiModelProperty(value = "药品信息化追溯体系（0-扫码入库，1-其他）")
 	private String medicineTraceability;
 
+	/**
+	 * 药品信息化追溯体系名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "药品信息化追溯体系名称")
+	private String medicineTraceabilityName;
+
 	/**
 	 * 药品信息化追溯体系-其他
 	 */