Merge branch 'dev' of http://192.168.1.220:10080/LiTaohong/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/base/dict/DictMedicineDO.java

@@ -1,17 +1,15 @@
package com.yihu.jw.entity.base.dict;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 药品字典实体
 * 
 * @author Administrator on  2018年09月05日
 * @author Administrator on  2018年09月07日
 *
 */
@Entity
@@ -19,12 +17,7 @@ import java.util.Date;
public class DictMedicineDO extends IntegerIdentityEntity {
    /**
	 * saas配置id，null标识公共字典
	 */
	private String saasId;
    /**
	 * 药品编码
	 * 药品代码
	 */
	private String code;
@@ -34,24 +27,85 @@ public class DictMedicineDO extends IntegerIdentityEntity {
	private String name;
    /**
	 * 药品类型：1健康记录
	 * 药品规格
	 */
	private String type;
	private String physicSpec;
    /**
	 * 创建时间
	 * 药品科目  科目类别字典中定义
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	private String subjectClass;
    /**
	 * 剂量单位 计量单位字典中定义
	 */
	private String doseUnit;
    /**
	 * 数量单位  计量单位字典中定义
	 */
	private String quantityUnit;
    /**
	 * 包装单位   计量单位字典中定义
	 */
	private String packUnit;
    /**
	 * 最小剂量
	 */
	private double minDose;
    /**
	 * 
	 */
	private double packSpec;
    /**
	 * 零售价
	 */
	private double retailPrice;
    /**
	 * 
	 */
	private String physicForm;
    /**
	 * 毒理分类  药品毒理分类字典中定义
	 */
	private String toxicologyType;
    /**
	 * 基本药物标志  0：否；1：是
	 */
	private String basicFlag;
    /**
	 * 有效标志 0：无效；1：有效
	 */
	private String validFlag;
    /**
	 * 拼音首码
	 */
	private String spellCode;
    /**
	 * 五笔首码
	 */
	private String wbzxCode;
    /**
	 * 排序号
	 */
	private Integer sequence;
    /**
	 * 2表示需要冷藏，其他表示不需要冷藏
	 */
	private String storageConditions;
	@Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
	@Column(name = "code")
    public String getCode() {
@@ -69,20 +123,132 @@ public class DictMedicineDO extends IntegerIdentityEntity {
        this.name = name;
    }
	@Column(name = "type")
    public String getType() {
        return type;
	@Column(name = "physic_spec")
    public String getPhysicSpec() {
        return physicSpec;
    }
    public void setPhysicSpec(String physicSpec) {
        this.physicSpec = physicSpec;
    }
	@Column(name = "subject_class")
    public String getSubjectClass() {
        return subjectClass;
    }
    public void setSubjectClass(String subjectClass) {
        this.subjectClass = subjectClass;
    }
	@Column(name = "dose_unit")
    public String getDoseUnit() {
        return doseUnit;
    }
    public void setDoseUnit(String doseUnit) {
        this.doseUnit = doseUnit;
    }
	@Column(name = "quantity_unit")
    public String getQuantityUnit() {
        return quantityUnit;
    }
    public void setQuantityUnit(String quantityUnit) {
        this.quantityUnit = quantityUnit;
    }
	@Column(name = "pack_unit")
    public String getPackUnit() {
        return packUnit;
    }
    public void setPackUnit(String packUnit) {
        this.packUnit = packUnit;
    }
	@Column(name = "min_dose")
    public double getMinDose() {
        return minDose;
    }
    public void setMinDose(double minDose) {
        this.minDose = minDose;
    }
	@Column(name = "pack_spec")
    public double getPackSpec() {
        return packSpec;
    }
    public void setPackSpec(double packSpec) {
        this.packSpec = packSpec;
    }
	@Column(name = "retail_price")
    public double getRetailPrice() {
        return retailPrice;
    }
    public void setRetailPrice(double retailPrice) {
        this.retailPrice = retailPrice;
    }
	@Column(name = "physic_form")
    public String getPhysicForm() {
        return physicForm;
    }
    public void setPhysicForm(String physicForm) {
        this.physicForm = physicForm;
    }
	@Column(name = "toxicology_type")
    public String getToxicologyType() {
        return toxicologyType;
    }
    public void setToxicologyType(String toxicologyType) {
        this.toxicologyType = toxicologyType;
    }
	@Column(name = "basic_flag")
    public String getBasicFlag() {
        return basicFlag;
    }
    public void setBasicFlag(String basicFlag) {
        this.basicFlag = basicFlag;
    }
	@Column(name = "valid_flag")
    public String getValidFlag() {
        return validFlag;
    }
    public void setValidFlag(String validFlag) {
        this.validFlag = validFlag;
    }
	@Column(name = "spell_code")
    public String getSpellCode() {
        return spellCode;
    }
    public void setSpellCode(String spellCode) {
        this.spellCode = spellCode;
    }
	@Column(name = "wbzx_code")
    public String getWbzxCode() {
        return wbzxCode;
    }
    public void setWbzxCode(String wbzxCode) {
        this.wbzxCode = wbzxCode;
    }
	@Column(name = "sequence")
    public Integer getSequence() {
        return sequence;
    }
    public void setType(String type) {
        this.type = type;
    public void setSequence(Integer sequence) {
        this.sequence = sequence;
    }
	@Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
	@Column(name = "storage_conditions")
    public String getStorageConditions() {
        return storageConditions;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    public void setStorageConditions(String storageConditions) {
        this.storageConditions = storageConditions;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/base/dict/DictMedicineDistributeOrgDO.java

@@ -0,0 +1,45 @@
package com.yihu.jw.entity.base.dict;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 机构药品分发字典实体
 * 
 * @author Administrator on  2018年09月07日
 *
 */
@Entity
@Table(name = "dict_medicine_distribute_org")
public class DictMedicineDistributeOrgDO extends IntegerIdentityEntity {
    /**
	 * 机构编码
	 */
	private String orgId;
    /**
	 * 药品代码
	 */
	private String medicineCode;
	@Column(name = "org_id")
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
	@Column(name = "medicine_code")
    public String getMedicineCode() {
        return medicineCode;
    }
    public void setMedicineCode(String medicineCode) {
        this.medicineCode = medicineCode;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/DictMedicineDistributeOrgVO.java

@@ -0,0 +1,50 @@
package com.yihu.jw.restmodel.base.dict;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * 
 * 机构药品分发字典vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2018年09月07日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "DictMedicineDistributeOrgVO", description = "机构药品分发字典")
public class DictMedicineDistributeOrgVO extends IntegerIdentityVO{
    /**
	 * 机构编码
	 */
	@ApiModelProperty(value = "机构编码", example = "")
    private String orgId;
    /**
	 * 药品代码
	 */
	@ApiModelProperty(value = "药品代码", example = "")
    private String medicineCode;
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    public String getMedicineCode() {
        return medicineCode;
    }
    public void setMedicineCode(String medicineCode) {
        this.medicineCode = medicineCode;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/DictMedicineVO.java

@@ -1,10 +1,8 @@
package com.yihu.jw.restmodel.base.dict;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
/**
@@ -14,7 +12,7 @@ import java.util.Date;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2018年09月05日 Created
 * Administrator 	1.0  2018年09月07日 Created
 *
 * </pre>
 * @since 1.
@@ -23,43 +21,119 @@ import java.util.Date;
public class DictMedicineVO extends IntegerIdentityVO{
    /**
	 * saas配置id，null标识公共字典
	 */
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "402803ee656498890165649ad2da1112")
    private String saasId;
     * 药品代码
     */
    @ApiModelProperty(value = "分发药品的机构名称", example = "")
    private String orgName;
    /**
	 * 药品编码
	 * 药品代码
	 */
	@ApiModelProperty(value = "药品编码", example = "A011")
	@ApiModelProperty(value = "药品代码", example = "")
    private String code;
    /**
	 * 药品名称
	 */
	@ApiModelProperty(value = "药品名称", example = "基础胰岛素")
	@ApiModelProperty(value = "药品名称", example = "")
    private String name;
    /**
	 * 药品类型：1健康记录
	 * 药品规格
	 */
	@ApiModelProperty(value = "药品类型：1健康记录", example = "1")
    private String type;
	@ApiModelProperty(value = "药品规格", example = "")
    private String physicSpec;
    /**
	 * 创建时间
	 * 药品科目  科目类别字典中定义
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "yyyy-MM-dd HH:mm:ss/该字段可不填")
    private Date createTime;
	@ApiModelProperty(value = "药品科目  科目类别字典中定义", example = "")
    private String subjectClass;
    /**
	 * 剂量单位 计量单位字典中定义
	 */
	@ApiModelProperty(value = "剂量单位 计量单位字典中定义", example = "")
    private String doseUnit;
    /**
	 * 数量单位  计量单位字典中定义
	 */
	@ApiModelProperty(value = "数量单位  计量单位字典中定义", example = "")
    private String quantityUnit;
    /**
	 * 包装单位   计量单位字典中定义
	 */
	@ApiModelProperty(value = "包装单位   计量单位字典中定义", example = "")
    private String packUnit;
    /**
	 * 最小剂量
	 */
	@ApiModelProperty(value = "最小剂量", example = "")
    private double minDose;
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "")
    private double packSpec;
    /**
	 * 零售价
	 */
	@ApiModelProperty(value = "零售价", example = "")
    private double retailPrice;
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "")
    private String physicForm;
    /**
	 * 毒理分类  药品毒理分类字典中定义
	 */
	@ApiModelProperty(value = "毒理分类  药品毒理分类字典中定义", example = "")
    private String toxicologyType;
    /**
	 * 基本药物标志  0：否；1：是
	 */
	@ApiModelProperty(value = "基本药物标志  0：否；1：是", example = "1")
    private String basicFlag;
    /**
	 * 有效标志 0：无效；1：有效
	 */
	@ApiModelProperty(value = "有效标志 0：无效；1：有效", example = "0")
    private String validFlag;
    /**
	 * 拼音首码
	 */
	@ApiModelProperty(value = "拼音首码", example = "")
    private String spellCode;
    /**
	 * 五笔首码
	 */
	@ApiModelProperty(value = "五笔首码", example = "")
    private String wbzxCode;
    /**
	 * 排序号
	 */
	@ApiModelProperty(value = "排序号", example = "")
    private Integer sequence;
    /**
	 * 2表示需要冷藏，其他表示不需要冷藏
	 */
	@ApiModelProperty(value = "2表示需要冷藏，其他表示不需要冷藏", example = "2")
    private String storageConditions;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getCode() {
        return code;
@@ -75,18 +149,116 @@ public class DictMedicineVO extends IntegerIdentityVO{
        this.name = name;
    }
    public String getType() {
        return type;
    public String getPhysicSpec() {
        return physicSpec;
    }
    public void setPhysicSpec(String physicSpec) {
        this.physicSpec = physicSpec;
    }
    public String getSubjectClass() {
        return subjectClass;
    }
    public void setSubjectClass(String subjectClass) {
        this.subjectClass = subjectClass;
    }
    public String getDoseUnit() {
        return doseUnit;
    }
    public void setDoseUnit(String doseUnit) {
        this.doseUnit = doseUnit;
    }
    public String getQuantityUnit() {
        return quantityUnit;
    }
    public void setQuantityUnit(String quantityUnit) {
        this.quantityUnit = quantityUnit;
    }
    public String getPackUnit() {
        return packUnit;
    }
    public void setPackUnit(String packUnit) {
        this.packUnit = packUnit;
    }
    public double getMinDose() {
        return minDose;
    }
    public void setMinDose(double minDose) {
        this.minDose = minDose;
    }
    public double getPackSpec() {
        return packSpec;
    }
    public void setPackSpec(double packSpec) {
        this.packSpec = packSpec;
    }
    public double getRetailPrice() {
        return retailPrice;
    }
    public void setRetailPrice(double retailPrice) {
        this.retailPrice = retailPrice;
    }
    public String getPhysicForm() {
        return physicForm;
    }
    public void setPhysicForm(String physicForm) {
        this.physicForm = physicForm;
    }
    public String getToxicologyType() {
        return toxicologyType;
    }
    public void setToxicologyType(String toxicologyType) {
        this.toxicologyType = toxicologyType;
    }
    public String getBasicFlag() {
        return basicFlag;
    }
    public void setBasicFlag(String basicFlag) {
        this.basicFlag = basicFlag;
    }
    public String getValidFlag() {
        return validFlag;
    }
    public void setValidFlag(String validFlag) {
        this.validFlag = validFlag;
    }
    public String getSpellCode() {
        return spellCode;
    }
    public void setSpellCode(String spellCode) {
        this.spellCode = spellCode;
    }
    public String getWbzxCode() {
        return wbzxCode;
    }
    public void setWbzxCode(String wbzxCode) {
        this.wbzxCode = wbzxCode;
    }
    public Integer getSequence() {
        return sequence;
    }
    public void setType(String type) {
        this.type = type;
    public void setSequence(Integer sequence) {
        this.sequence = sequence;
    }
    public Date getCreateTime() {
        return createTime;
    public String getStorageConditions() {
        return storageConditions;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    public void setStorageConditions(String storageConditions) {
        this.storageConditions = storageConditions;
    }

sql/init.sql

@@ -318,12 +318,13 @@ primary key (id)
ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='职称字典';
-- 机构药品分发
CREATE TABLE `zy_iv_org_physic_allot_dict` (
drop table IF EXISTS `dict_medicine_distribute_org`;
CREATE TABLE `dict_medicine_distribute_org` (
  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
  `org_id` varchar(50) DEFAULT NULL COMMENT '机构编码',
  `physic_code` varchar(50) DEFAULT NULL COMMENT '药品代码',
  `disp_quantity_untuck_flag` int(10) DEFAULT NULL,
  `disp_pack_untuck_flag` int(10) DEFAULT NULL,
  `medicine_code` varchar(50) DEFAULT NULL COMMENT '药品代码',
#   `disp_quantity_untuck_flag` int(10) DEFAULT NULL,
#   `disp_pack_untuck_flag` int(10) DEFAULT NULL,
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='机构药品分发字典';
@@ -331,8 +332,8 @@ CREATE TABLE `zy_iv_org_physic_allot_dict` (
drop table IF EXISTS `dict_medicine`;
create table `dict_medicine`(
  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
  `physic_code` varchar(50) DEFAULT NULL COMMENT '药品代码',
  `physic_name` varchar(2000) DEFAULT NULL COMMENT '药品名称',
  `code` varchar(50) DEFAULT NULL COMMENT '药品代码',
  `name` varchar(2000) DEFAULT NULL COMMENT '药品名称',
  `physic_spec` varchar(2000) DEFAULT NULL COMMENT '药品规格',
  `subject_class` varchar(200) DEFAULT NULL COMMENT '药品科目  科目类别字典中定义',
  `dose_unit` varchar(50) DEFAULT NULL COMMENT '剂量单位 计量单位字典中定义',

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictMedicineDao.java

@@ -1,9 +1,9 @@
package com.yihu.jw.base.dao.dict;
import com.yihu.jw.entity.base.dict.DictMedicineDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.jw.entity.base.dict.DictMedicineDO;
/**
 * 
@@ -12,7 +12,7 @@ import com.yihu.jw.entity.base.dict.DictMedicineDO;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年08月31日 	Created
 * Administrator 	1.0  		2018年09月07日 	Created
 *
 * </pre>
 * @since 1.

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictMedicineDistributeOrgDao.java

@@ -0,0 +1,21 @@
package com.yihu.jw.base.dao.dict;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.jw.entity.base.DictMedicineDistributeOrgDO;
/**
 * 
 * 机构药品分发字典 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  		2018年09月07日 	Created
 *
 * </pre>
 * @since 1.
 */
public interface DictMedicineDistributeOrgDao extends PagingAndSortingRepository<DictMedicineDistributeOrgDO, Integer>, JpaSpecificationExecutor<DictMedicineDistributeOrgDO>  {
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/DictMedicineDistributeOrgEndpoint.java

@@ -0,0 +1,108 @@
/*
package com.yihu.jw.base.endpoint.dict;
import com.yihu.jw.base.service.dict.DictMedicineDistributeOrgService;
import com.yihu.jw.entity.base.dict.DictMedicineDistributeOrgDO;
import com.yihu.jw.restmodel.base.dict.DictMedicineDistributeOrgVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
*/
/**
*
* 机构药品分发字典控制器
*
* @version
* <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  		2018年09月07日 	Created
 *
 * </pre>
* @since 1.
*//*
@RestController
@RequestMapping(value = BaseRequestMapping.DictMedicineDistributeOrg.PREFIX)
@Api(value = "机构药品分发字典管理", description = "机构药品分发字典管理服务接口", tags = {"wlyy基础服务 - 机构药品分发字典管理服务接口"})
public class DictMedicineDistributeOrgEndpoint extends EnvelopRestEndpoint {
@Autowired
private DictMedicineDistributeOrgService dictMedicineDistributeOrgService;
@PostMapping(value = BaseRequestMapping.DictMedicineDistributeOrg.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<DictMedicineDistributeOrgVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    DictMedicineDistributeOrgDO dictMedicineDistributeOrg = toEntity(jsonData, DictMedicineDistributeOrgDO.class);
    dictMedicineDistributeOrg = dictMedicineDistributeOrgService.save(dictMedicineDistributeOrg);
    return success(dictMedicineDistributeOrg, DictMedicineDistributeOrgVO.class);
    }
    @PostMapping(value = BaseRequestMapping.DictMedicineDistributeOrg.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    dictMedicineDistributeOrgService.delete(ids.split(","));
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.DictMedicineDistributeOrg.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<DictMedicineDistributeOrgVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        DictMedicineDistributeOrgDO dictMedicineDistributeOrg = toEntity(jsonData, DictMedicineDistributeOrgDO.class);
        if (null == dictMedicineDistributeOrg.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
        dictMedicineDistributeOrg = dictMedicineDistributeOrgService.save(dictMedicineDistributeOrg);
        return success(dictMedicineDistributeOrg, DictMedicineDistributeOrgVO.class);
        }
        @GetMapping(value = BaseRequestMapping.DictMedicineDistributeOrg.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<DictMedicineDistributeOrgVO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
            List<DictMedicineDistributeOrgDO> dictMedicineDistributeOrgs = dictMedicineDistributeOrgService.search(fields, filters, sorts, page, size);
                int count = (int)dictMedicineDistributeOrgService.getCount(filters);
                return success(dictMedicineDistributeOrgs, count, page, size, DictMedicineDistributeOrgVO.class);
         }
         @GetMapping(value = BaseRequestMapping.DictMedicineDistributeOrg.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<DictMedicineDistributeOrgVO> list (
             @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
             @RequestParam(value = "fields", required = false) String fields,
             @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
             @RequestParam(value = "filters", required = false) String filters,
             @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
             @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
             List<DictMedicineDistributeOrgDO> dictMedicineDistributeOrgs = dictMedicineDistributeOrgService.search(fields, filters, sorts);
                  return success(dictMedicineDistributeOrgs, DictMedicineDistributeOrgVO.class);
         }
 }
*/

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/DictMedicineEndpoint.java

@@ -1,6 +1,8 @@
package com.yihu.jw.base.endpoint.dict;
import com.yihu.jw.base.service.dict.DictMedicineDistributeOrgService;
import com.yihu.jw.base.service.dict.DictMedicineService;
import com.yihu.jw.entity.base.dict.DictMedicineDO;
import com.yihu.jw.restmodel.base.dict.DictMedicineVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
@@ -17,14 +19,12 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yihu.jw.entity.base.dict.DictMedicineDO;
/**
 * 药品字典控制器
 *
 * @version <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年08月31日 	Created
 * Administrator 	1.0  		2018年09月07日 	Created
 *
 * </pre>
 * @since 1.
@@ -36,6 +36,8 @@ public class DictMedicineEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private DictMedicineService dictMedicineService;
    @Autowired
    private DictMedicineDistributeOrgService dictMedicineDistributeOrgService;
    @PostMapping(value = BaseRequestMapping.DictMedicine.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/DictMedicineDistributeOrgService.java

@@ -0,0 +1,22 @@
package com.yihu.jw.base.service.dict;
import com.yihu.jw.base.dao.dict.DictMedicineDistributeOrgDao;
import com.yihu.jw.entity.base.dict.DictMedicineDistributeOrgDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * 
 * 机构药品分发字典服务service
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator    1.0  2018年09月07日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class DictMedicineDistributeOrgService extends BaseJpaService<DictMedicineDistributeOrgDO, DictMedicineDistributeOrgDao> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/DictMedicineService.java

@@ -1,9 +1,11 @@
package com.yihu.jw.base.service.dict;
import com.yihu.jw.base.dao.dict.DictMedicineDao;
import com.yihu.jw.entity.base.dict.DictMedicineDO;
import com.yihu.jw.entity.base.dict.DictMedicineDistributeOrgDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.yihu.jw.entity.base.dict.DictMedicineDO;
/**
 * 
@@ -12,11 +14,12 @@ import com.yihu.jw.entity.base.dict.DictMedicineDO;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong    1.0  2018年08月31日 Created
 * Administrator    1.0  2018年09月07日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class DictMedicineService extends BaseJpaService<DictMedicineDO, DictMedicineDao> {
}