Merge branch 'feature-businesscompany-210720' of googol/YY_BE_2 into master

db/v2.0/0720.sql

@@ -0,0 +1,5 @@
+-- 档案-配送公司表新增字段
+ALTER TABLE `wm_da_distribution`
+    ADD COLUMN `medicine_traceability`  varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '药品信息化追溯体系（0-扫码入库，1-其他）' AFTER `sygsdz`,
+    ADD COLUMN `medicine_traceability_other`  varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '药品信息化追溯体系-其他（追溯体系介绍）' AFTER `medicine_traceability`;
+

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;
@@ -24,7 +25,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.io.Serializable;
+
 import java.time.LocalDateTime;
 
 /**
@@ -38,178 +39,240 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "档案-配送公司")
 public class WmDaDistribution extends Model<WmDaDistribution> {
-private static final long serialVersionUID = 1L;
-
-    /**
-     *
-     */
-    @TableId
-    @ApiModelProperty(value="")
-    private String id;
-    /**
-     * 商业公司名称
-     */
-    @ApiModelProperty(value="商业公司名称")
-    private String gsmc;
-    /**
-     * 省
-     */
-    @ApiModelProperty(value="省")
-    private String province;
-    /**
-     * 市
-     */
-    @ApiModelProperty(value="市")
-    private String city;
-    /**
-     * 区
-     */
-    @ApiModelProperty(value="区")
-    private String area;
-    /**
-     * 地址
-     */
-    @ApiModelProperty(value="地址")
-    private String address;
-    /**
-     * 经度
-     */
-    @ApiModelProperty(value="经度")
-    private String longitude;
-    /**
-     * 纬度
-     */
-    @ApiModelProperty(value="纬度")
-    private String latitude;
-    /**
-     * 公司规模
-     */
-    @ApiModelProperty(value="公司规模")
-    private String gsgm;
-    /**
-     * 三合一社会信用代码
-     */
-    @ApiModelProperty(value="三合一社会信用代码")
-    private String shyshxydm;
-    /**
-     * 公司注册地
-     */
-    @ApiModelProperty(value="公司注册地")
-    private String gszcd;
-    /**
-     * 注册资本
-     */
-    @ApiModelProperty(value="注册资本")
-    private String zczb;
-    /**
-     * GSP证书编号
-     */
-    @ApiModelProperty(value="GSP证书编号")
-    private String gspzsbh;
-    /**
-     * 法人代表
-     */
-    @ApiModelProperty(value="法人代表")
-    private String frdb;
-    /**
-     * 总经理
-     */
-    @ApiModelProperty(value="总经理")
-    private String zjl;
-    /**
-     * 采购部门负责人姓名
-     */
-    @ApiModelProperty(value="采购部门负责人姓名")
-    private String cjbmfzrxm;
-    /**
-     * 采购部门负责人联系方式
-     */
-    @ApiModelProperty(value="采购部门负责人联系方式")
-    private String cjbmfzrlxfs;
-    /**
-     * 采购部门对接人姓名
-     */
-    @ApiModelProperty(value="采购部门对接人姓名")
-    private String cgbmdjrxm;
-    /**
-     * 采购部门对接人联系方式
-     */
-    @ApiModelProperty(value="采购部门对接人联系方式")
-    private String cgbmdjrlxfs;
-    /**
-     * 销售部门负责人姓名
-     */
-    @ApiModelProperty(value="销售部门负责人姓名")
-    private String xsbmfzrxm;
-    /**
-     * 销售部门负责人联系方式
-     */
-    @ApiModelProperty(value="销售部门负责人联系方式")
-    private String xsbmfzrlxfs;
-    /**
-     * 销售部门对接人姓名
-     */
-    @ApiModelProperty(value="销售部门对接人姓名")
-    private String xsbmdjrxm;
-    /**
-     * 销售部门对接人联系方式
-     */
-    @ApiModelProperty(value="销售部门对接人联系方式")
-    private String xsbmdjrlxfs;
-    /**
-     * 公司简介
-     */
-    @ApiModelProperty(value="公司简介")
-    private String gsjj;
-    /**
-     * 经营优势
-     */
-    @ApiModelProperty(value="经营优势")
-    private String jyys;
-    /**
-     * 组织机构ID
-     */
-    @ApiModelProperty(value="组织机构ID")
-    private Integer deptId;
-    /**
-     * 是否删除
-     */
-    @ApiModelProperty(value="是否删除")
-    private Integer delFlag;
-    /**
-     * 是否禁用
-     */
-    @ApiModelProperty(value="是否禁用")
-    private Integer enableFlag;
-    /**
-     * 所属租户
-     */
-    @ApiModelProperty(value="所属租户",hidden=true)
-    private Integer tenantId;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value="创建时间")
-    private LocalDateTime createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value="创建人")
-    private Integer createUser;
-    /**
-     * 更新时间
-     */
-    @ApiModelProperty(value="更新时间")
-    private LocalDateTime updateTime;
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value="更新人")
-    private Integer updateUser;
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 *
+	 */
+	@TableId
+	@ApiModelProperty(value = "")
+	private String id;
+	/**
+	 * 商业公司名称
+	 */
+	@ApiModelProperty(value = "商业公司名称")
+	private String gsmc;
+	/**
+	 * 省
+	 */
+	@ApiModelProperty(value = "省")
+	private String province;
+	/**
+	 * 市
+	 */
+	@ApiModelProperty(value = "市")
+	private String city;
+	/**
+	 * 区
+	 */
+	@ApiModelProperty(value = "区")
+	private String area;
+	/**
+	 * 地址
+	 */
+	@ApiModelProperty(value = "地址")
+	private String address;
+	/**
+	 * 经度
+	 */
+	@ApiModelProperty(value = "经度")
+	private String longitude;
+	/**
+	 * 纬度
+	 */
+	@ApiModelProperty(value = "纬度")
+	private String latitude;
+	/**
+	 * 公司规模
+	 */
+	@ApiModelProperty(value = "公司规模")
+	private String gsgm;
+	/**
+	 * 三合一社会信用代码
+	 */
+	@ApiModelProperty(value = "三合一社会信用代码")
+	private String shyshxydm;
+	/**
+	 * 公司注册地
+	 */
+	@ApiModelProperty(value = "公司注册地")
+	private String gszcd;
+	/**
+	 * 注册资本
+	 */
+	@ApiModelProperty(value = "注册资本")
+	private String zczb;
+	/**
+	 * GSP证书编号
+	 */
+	@ApiModelProperty(value = "GSP证书编号")
+	private String gspzsbh;
+	/**
+	 * 法人代表
+	 */
+	@ApiModelProperty(value = "法人代表")
+	private String frdb;
+	/**
+	 * 总经理
+	 */
+	@ApiModelProperty(value = "总经理")
+	private String zjl;
+	/**
+	 * 采购部门负责人姓名
+	 */
+	@ApiModelProperty(value = "采购部门负责人姓名")
+	private String cjbmfzrxm;
+	/**
+	 * 采购部门负责人联系方式
+	 */
+	@ApiModelProperty(value = "采购部门负责人联系方式")
+	private String cjbmfzrlxfs;
+	/**
+	 * 采购部门对接人姓名
+	 */
+	@ApiModelProperty(value = "采购部门对接人姓名")
+	private String cgbmdjrxm;
+	/**
+	 * 采购部门对接人联系方式
+	 */
+	@ApiModelProperty(value = "采购部门对接人联系方式")
+	private String cgbmdjrlxfs;
+	/**
+	 * 销售部门负责人姓名
+	 */
+	@ApiModelProperty(value = "销售部门负责人姓名")
+	private String xsbmfzrxm;
+	/**
+	 * 销售部门负责人联系方式
+	 */
+	@ApiModelProperty(value = "销售部门负责人联系方式")
+	private String xsbmfzrlxfs;
+	/**
+	 * 销售部门对接人姓名
+	 */
+	@ApiModelProperty(value = "销售部门对接人姓名")
+	private String xsbmdjrxm;
+	/**
+	 * 销售部门对接人联系方式
+	 */
+	@ApiModelProperty(value = "销售部门对接人联系方式")
+	private String xsbmdjrlxfs;
+	/**
+	 * 公司简介
+	 */
+	@ApiModelProperty(value = "公司简介")
+	private String gsjj;
+	/**
+	 * 经营优势
+	 */
+	@ApiModelProperty(value = "经营优势")
+	private String jyys;
+	/**
+	 * 组织机构ID
+	 */
+	@ApiModelProperty(value = "组织机构ID")
+	private Integer deptId;
+	/**
+	 * 是否删除
+	 */
+	@ApiModelProperty(value = "是否删除")
+	private Integer delFlag;
+	/**
+	 * 是否禁用
+	 */
+	@ApiModelProperty(value = "是否禁用")
+	private Integer enableFlag;
+	/**
+	 * 所属租户
+	 */
+	@ApiModelProperty(value = "所属租户", hidden = true)
+	private Integer tenantId;
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private Integer createUser;
+	/**
+	 * 更新时间
+	 */
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+	/**
+	 * 更新人
+	 */
+	@ApiModelProperty(value = "更新人")
+	private Integer updateUser;
 
 	/**
 	 * 商业公司地址
 	 */
-	@ApiModelProperty(value="商业公司地址")
+	@ApiModelProperty(value = "商业公司地址")
 	private String sygsdz;
-    }
+
+	/**
+	 * 药品信息化追溯体系（0-扫码入库，1-其他）
+	 */
+	@ApiModelProperty(value = "药品信息化追溯体系（0-扫码入库，1-其他）")
+	private String medicineTraceability;
+
+	/**
+	 * 药品信息化追溯体系名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "药品信息化追溯体系名称")
+	private String medicineTraceabilityName;
+
+	/**
+	 * 药品信息化追溯体系-其他
+	 */
+	@ApiModelProperty(value = "药品信息化追溯体系-其他")
+	private String medicineTraceabilityOther;
+
+	/**
+	 * 药品信息化追溯体系枚举类
+	 */
+	public enum MedicineTraceabilityEnum {
+		// 0-扫码入库，1-其他
+		SCAN_CODE("0", "扫码入库"),
+		OTHER("1", "其他"),
+		DEFAULT_NULL("", "");
+
+		private String val;
+
+		private String name;
+
+		MedicineTraceabilityEnum(String val, String name) {
+			this.val = val;
+			this.name = name;
+		}
+
+		public String getVal() {
+			return val;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+	}
+
+	/**
+	 * 药品信息化追溯体系枚举类转换
+	 *
+	 * @param val
+	 * @return
+	 */
+	public static MedicineTraceabilityEnum resolve(String val){
+		for (MedicineTraceabilityEnum medicineTraceabilityEnum: MedicineTraceabilityEnum.values()){
+			if (medicineTraceabilityEnum.val.equals(val)){
+				return medicineTraceabilityEnum;
+			}
+		}
+		return MedicineTraceabilityEnum.DEFAULT_NULL;
+	}
+}

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

@@ -18,13 +18,22 @@ package com.qunzhixinxi.hnqz.admin.service.impl;
 
 import com.alibaba.csp.sentinel.util.StringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDictItem;
-import com.qunzhixinxi.hnqz.admin.entity.*;
+import com.qunzhixinxi.hnqz.admin.entity.WmDaDistribution;
+import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
+import com.qunzhixinxi.hnqz.admin.entity.WmScorePackageStatus;
+import com.qunzhixinxi.hnqz.admin.entity.WmTask;
+import com.qunzhixinxi.hnqz.admin.entity.WmTaskContent;
 import com.qunzhixinxi.hnqz.admin.mapper.WmDaDistributionMapper;
-import com.qunzhixinxi.hnqz.admin.service.*;
+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.WmScorePackageService;
+import com.qunzhixinxi.hnqz.admin.service.WmScorePackageStatusService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskContentService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
@@ -196,6 +205,8 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 			wmDaDistribution.setXsbmdjrlxfs(wmTaskContent.getTemp19());//销售部门对接人联系方式
 			wmDaDistribution.setGsjj(wmTaskContent.getTemp20());//公司简介
 			wmDaDistribution.setJyys(wmTaskContent.getTemp21());//经营优势
+			wmDaDistribution.setMedicineTraceability(wmTaskContent.getTemp22()); // 药品信息化追溯体系
+			wmDaDistribution.setMedicineTraceabilityOther(wmTaskContent.getTemp25()); // 追溯体系介绍
 			wmDaDistribution.setCreateTime(LocalDateTime.now());
 			newinfo=wmDaDistribution;
 
@@ -329,6 +340,15 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 			resList.add(generateMap("经营优势",wmDaDistribution.getJyys(),wmTaskContent.getTemp21()));
 			newinfo.setJyys(wmTaskContent.getTemp21());
 		}
+		if (null != wmTaskContent.getTemp22() && !wmTaskContent.getTemp22().equals(wmDaDistribution.getMedicineTraceability())) {
+			resList.add(generateMap("药品信息化追溯体系", WmDaDistribution.resolve(wmDaDistribution.getMedicineTraceability()).getName(),
+					WmDaDistribution.resolve(wmTaskContent.getTemp22()).getName()));
+			newinfo.setMedicineTraceability(wmTaskContent.getTemp22());
+		}
+		if (null != wmTaskContent.getTemp25() && !wmTaskContent.getTemp25().equals(wmDaDistribution.getMedicineTraceabilityOther())) {
+			resList.add(generateMap("追溯体系介绍", wmDaDistribution.getMedicineTraceabilityOther(), wmTaskContent.getTemp25()));
+			newinfo.setMedicineTraceabilityOther(wmTaskContent.getTemp25());
+		}
 
 		return resList;
 
@@ -478,6 +498,8 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 		wmDaDistribution.setXsbmdjrlxfs(StringUtil.isEmpty(map.get("xsbmdjrlxfs"))?null:map.get("xsbmdjrlxfs"));//销售部门对接人联系方式
 		wmDaDistribution.setGsjj(StringUtil.isEmpty(map.get("gsjj"))?null:map.get("gsjj"));//公司简介
 		wmDaDistribution.setJyys(StringUtil.isEmpty(map.get("jyys"))?null:map.get("jyys"));//经营优势
+		wmDaDistribution.setMedicineTraceability(StringUtils.isEmpty(map.get("medicineTraceability")) ? null : map.get("medicineTraceability"));
+		wmDaDistribution.setMedicineTraceabilityOther(StringUtils.isEmpty(map.get("medicineTraceabilityOther")) ? null : map.get("medicineTraceabilityOther"));
 
 		wmDaDistribution.setLongitude(StringUtil.isEmpty(map.get("longitude"))?null:map.get("longitude"));//经度
 		wmDaDistribution.setLatitude(StringUtil.isEmpty(map.get("latitude"))?null:map.get("latitude"));//纬度

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmDaDistributionMapper.xml

@@ -23,43 +23,45 @@
 
 <mapper namespace="com.qunzhixinxi.hnqz.admin.mapper.WmDaDistributionMapper">
 
-  <resultMap id="wmDaDistributionMap" type="com.qunzhixinxi.hnqz.admin.entity.WmDaDistribution">
-                  <id property="id" column="id"/>
-                        <result property="gsmc" column="gsmc"/>
-                        <result property="sygsdz" column="sygsdz"/>
-                        <result property="province" column="province"/>
-                        <result property="city" column="city"/>
-                        <result property="area" column="area"/>
-                        <result property="address" column="address"/>
-                        <result property="longitude" column="longitude"/>
-                        <result property="latitude" column="latitude"/>
-                        <result property="gsgm" column="gsgm"/>
-                        <result property="shyshxydm" column="shyshxydm"/>
-                        <result property="gszcd" column="gszcd"/>
-                        <result property="zczb" column="zczb"/>
-                        <result property="gspzsbh" column="gspzsbh"/>
-                        <result property="frdb" column="frdb"/>
-                        <result property="zjl" column="zjl"/>
-                        <result property="cjbmfzrxm" column="cjbmfzrxm"/>
-                        <result property="cjbmfzrlxfs" column="cjbmfzrlxfs"/>
-                        <result property="cgbmdjrxm" column="cgbmdjrxm"/>
-                        <result property="cgbmdjrlxfs" column="cgbmdjrlxfs"/>
-                        <result property="xsbmfzrxm" column="xsbmfzrxm"/>
-                        <result property="xsbmfzrlxfs" column="xsbmfzrlxfs"/>
-                        <result property="xsbmdjrxm" column="xsbmdjrxm"/>
-                        <result property="xsbmdjrlxfs" column="xsbmdjrlxfs"/>
-                        <result property="gsjj" column="gsjj"/>
-                        <result property="jyys" column="jyys"/>
-                        <result property="deptId" column="dept_id"/>
-                        <result property="delFlag" column="del_flag"/>
-                        <result property="enableFlag" column="enable_flag"/>
-                        <result property="tenantId" column="tenant_id"/>
-                        <result property="createTime" column="create_time"/>
-                        <result property="createUser" column="create_user"/>
-                        <result property="updateTime" column="update_time"/>
-                        <result property="updateUser" column="update_user"/>
-            </resultMap>
-
+	<resultMap id="wmDaDistributionMap" type="com.qunzhixinxi.hnqz.admin.entity.WmDaDistribution">
+		<id property="id" column="id"/>
+		<result property="gsmc" column="gsmc"/>
+		<result property="sygsdz" column="sygsdz"/>
+		<result property="province" column="province"/>
+		<result property="city" column="city"/>
+		<result property="area" column="area"/>
+		<result property="address" column="address"/>
+		<result property="longitude" column="longitude"/>
+		<result property="latitude" column="latitude"/>
+		<result property="gsgm" column="gsgm"/>
+		<result property="shyshxydm" column="shyshxydm"/>
+		<result property="gszcd" column="gszcd"/>
+		<result property="zczb" column="zczb"/>
+		<result property="gspzsbh" column="gspzsbh"/>
+		<result property="frdb" column="frdb"/>
+		<result property="zjl" column="zjl"/>
+		<result property="cjbmfzrxm" column="cjbmfzrxm"/>
+		<result property="cjbmfzrlxfs" column="cjbmfzrlxfs"/>
+		<result property="cgbmdjrxm" column="cgbmdjrxm"/>
+		<result property="cgbmdjrlxfs" column="cgbmdjrlxfs"/>
+		<result property="xsbmfzrxm" column="xsbmfzrxm"/>
+		<result property="xsbmfzrlxfs" column="xsbmfzrlxfs"/>
+		<result property="xsbmdjrxm" column="xsbmdjrxm"/>
+		<result property="xsbmdjrlxfs" column="xsbmdjrlxfs"/>
+		<result property="gsjj" column="gsjj"/>
+		<result property="jyys" column="jyys"/>
+		<result property="deptId" column="dept_id"/>
+		<result property="delFlag" column="del_flag"/>
+		<result property="enableFlag" column="enable_flag"/>
+		<result property="tenantId" column="tenant_id"/>
+		<result property="createTime" column="create_time"/>
+		<result property="createUser" column="create_user"/>
+		<result property="updateTime" column="update_time"/>
+		<result property="updateUser" column="update_user"/>
+		<result property="sygsdz" column="sygsdz"/>
+		<result property="medicineTraceability" column="medicine_traceability"/>
+		<result property="medicineTraceabilityOther" column="medicine_traceability_other"/>
+	</resultMap>
 
 	<select  id="listByPoint" resultMap="wmDaDistributionMap">
 		SELECT