药品字典

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

@@ -9,7 +9,7 @@ import javax.persistence.Table;
/**
 * 药品字典实体
 * 
 * @author Administrator on  2018年09月07日
 * @author litaohong on  2018年09月11日
 *
 */
@Entity
@@ -22,69 +22,34 @@ public class DictMedicineDO extends IntegerIdentityEntity {
	private String code;
    /**
	 * 药品名称
	 * 药品中文名
	 */
	private String name;
    /**
	 * 药品规格
	 */
	private String physicSpec;
    /**
	 * 药品科目  科目类别字典中定义
	 */
	private String subjectClass;
    /**
	 * 剂量单位 计量单位字典中定义
	 */
	private String doseUnit;
    /**
	 * 数量单位  计量单位字典中定义
	 */
	private String quantityUnit;
    /**
	 * 包装单位   计量单位字典中定义
	 */
	private String packUnit;
    /**
	 * 最小剂量
	 */
	private double minDose;
    /**
	 * 
	 */
	private double packSpec;
    /**
	 * 零售价
	 * 药品所属科目代码
	 */
	private double retailPrice;
	private String subjectCode;
    /**
	 * 
	 * 药品剂型
	 */
	private String physicForm;
	private String dosageForm;
    /**
	 * 毒理分类  药品毒理分类字典中定义
	 * 药品规格
	 */
	private String toxicologyType;
	private String specification;
    /**
	 * 基本药物标志  0：否；1：是
	 * 包装规格
	 */
	private String basicFlag;
	private String packingSpecification;
    /**
	 * 有效标志 0：无效；1：有效
	 * 适应症
	 */
	private String validFlag;
	private String indication;
    /**
	 * 拼音首码
@@ -123,100 +88,44 @@ public class DictMedicineDO extends IntegerIdentityEntity {
        this.name = name;
    }
	@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;
	@Column(name = "subject_code")
    public String getSubjectCode() {
        return subjectCode;
    }
    public void setRetailPrice(double retailPrice) {
        this.retailPrice = retailPrice;
    public void setSubjectCode(String subjectCode) {
        this.subjectCode = subjectCode;
    }
	@Column(name = "physic_form")
    public String getPhysicForm() {
        return physicForm;
	@Column(name = "dosage_form")
    public String getDosageForm() {
        return dosageForm;
    }
    public void setPhysicForm(String physicForm) {
        this.physicForm = physicForm;
    public void setDosageForm(String dosageForm) {
        this.dosageForm = dosageForm;
    }
	@Column(name = "toxicology_type")
    public String getToxicologyType() {
        return toxicologyType;
	@Column(name = "specification")
    public String getSpecification() {
        return specification;
    }
    public void setToxicologyType(String toxicologyType) {
        this.toxicologyType = toxicologyType;
    public void setSpecification(String specification) {
        this.specification = specification;
    }
	@Column(name = "basic_flag")
    public String getBasicFlag() {
        return basicFlag;
	@Column(name = "packing_specification")
    public String getPackingSpecification() {
        return packingSpecification;
    }
    public void setBasicFlag(String basicFlag) {
        this.basicFlag = basicFlag;
    public void setPackingSpecification(String packingSpecification) {
        this.packingSpecification = packingSpecification;
    }
	@Column(name = "valid_flag")
    public String getValidFlag() {
        return validFlag;
	@Column(name = "indication")
    public String getIndication() {
        return indication;
    }
    public void setValidFlag(String validFlag) {
        this.validFlag = validFlag;
    public void setIndication(String indication) {
        this.indication = indication;
    }
	@Column(name = "spell_code")

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

@@ -9,7 +9,7 @@ import javax.persistence.Table;
/**
 * 机构药品分发字典实体
 * 
 * @author Administrator on  2018年09月07日
 * @author litaohong on  2018年09月11日
 *
 */
@Entity
@@ -26,6 +26,12 @@ public class DictMedicineDistributeOrgDO extends IntegerIdentityEntity {
	 */
	private String medicineCode;
    /**
	 * 分发数量
	 */
	private Integer quantity;
	@Column(name = "org_id")
    public String getOrgId() {
        return orgId;
@@ -42,4 +48,14 @@ public class DictMedicineDistributeOrgDO extends IntegerIdentityEntity {
        this.medicineCode = medicineCode;
    }
	@Column(name = "quantity")
    public Integer getQuantity() {
        return quantity;
    }
    public void setQuantity(Integer quantity) {
        this.quantity = quantity;
    }
}

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

@@ -0,0 +1,48 @@
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 litaohong on  2018年09月11日
 *
 */
@Entity
@Table(name = "dict_medicine_dosage_form")
public class DictMedicineDosageFormDO extends IntegerIdentityEntity {
    /**
	 * 剂型代码
	 */
	private String code;
    /**
	 * 剂型名称（颗粒型，注射液，胶囊等）
	 */
	private String name;
	@Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
	@Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}

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

@@ -0,0 +1,61 @@
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 litaohong on  2018年09月11日
 *
 */
@Entity
@Table(name = "dict_medicine_subject")
public class DictMedicineSubjectDO extends IntegerIdentityEntity {
    /**
	 * 类别代码
	 */
	private String code;
    /**
	 * 类别名称
	 */
	private String name;
    /**
	 * 父类code
	 */
	private String parentCode;
	@Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
	@Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
	@Column(name = "parent_code")
    public String getParentCode() {
        return parentCode;
    }
    public void setParentCode(String parentCode) {
        this.parentCode = parentCode;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -365,6 +365,24 @@ public class BaseRequestMapping {
    public static class DictMedicine extends Basic {
        public static final String PREFIX  = "/dictMedicine";
    }
   /**
     * 药品剂型
     */
    public static class DictMedicineDosageForm extends Basic {
        public static final String PREFIX  = "/dictMedicineDosageForm";
    }
   /**
     * 药品字典科目类别
     */
    public static class DictMedicineSubject extends Basic {
        public static final String PREFIX  = "/dictMedicineSubject";
    }
   /**
     * 药品分发机构
     */
    public static class DictMedicineDistributeOrg extends Basic {
        public static final String PREFIX  = "/dictMedicineDistributeOrg";
    }
    /**
     * app版本升级

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

@@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2018年09月07日 Created
 * litaohong 	1.0  2018年09月11日 Created
 *
 * </pre>
 * @since 1.
@@ -23,15 +23,21 @@ public class DictMedicineDistributeOrgVO extends IntegerIdentityVO{
    /**
	 * 机构编码
	 */
	@ApiModelProperty(value = "机构编码", example = "")
	@ApiModelProperty(value = "机构编码", example = "模块1")
    private String orgId;
    /**
	 * 药品代码
	 */
	@ApiModelProperty(value = "药品代码", example = "")
	@ApiModelProperty(value = "药品代码", example = "模块1")
    private String medicineCode;
    /**
	 * 分发数量
	 */
	@ApiModelProperty(value = "分发数量", example = "模块1")
    private Integer quantity;
    public String getOrgId() {
        return orgId;
@@ -47,4 +53,12 @@ public class DictMedicineDistributeOrgVO extends IntegerIdentityVO{
        this.medicineCode = medicineCode;
    }
    public Integer getQuantity() {
        return quantity;
    }
    public void setQuantity(Integer quantity) {
        this.quantity = quantity;
    }
}

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

@@ -0,0 +1,51 @@
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
 * litaohong 	1.0  2018年09月11日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "DictMedicineDosageFormVO", description = "药品剂型字典")
public class DictMedicineDosageFormVO extends IntegerIdentityVO{
    /**
	 * 剂型代码
	 */
	@ApiModelProperty(value = "剂型代码", example = "模块1")
    private String code;
    /**
	 * 剂型名称（颗粒型，注射液，胶囊等）
	 */
	@ApiModelProperty(value = "剂型名称（颗粒型，注射液，胶囊等）", example = "模块1")
    private String name;
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}

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

@@ -0,0 +1,64 @@
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
 * litaohong 	1.0  2018年09月11日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "DictMedicineSubjectVO", description = "药品科目类别字典")
public class DictMedicineSubjectVO extends IntegerIdentityVO{
    /**
	 * 类别代码
	 */
	@ApiModelProperty(value = "类别代码", example = "模块1")
    private String code;
    /**
	 * 类别名称
	 */
	@ApiModelProperty(value = "类别名称", example = "模块1")
    private String name;
    /**
	 * 父类code
	 */
	@ApiModelProperty(value = "父类code", example = "模块1")
    private String parentCode;
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getParentCode() {
        return parentCode;
    }
    public void setParentCode(String parentCode) {
        this.parentCode = parentCode;
    }
}

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

@@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2018年09月07日 Created
 * litaohong 	1.0  2018年09月11日 Created
 *
 * </pre>
 * @since 1.
@@ -20,118 +20,70 @@ import io.swagger.annotations.ApiModelProperty;
@ApiModel(value = "DictMedicineVO", description = "药品字典")
public class DictMedicineVO extends IntegerIdentityVO{
    /**
     * 药品代码
     */
    @ApiModelProperty(value = "分发药品的机构名称", example = "")
    private String orgName;
    /**
	 * 药品代码
	 */
	@ApiModelProperty(value = "药品代码", example = "")
	@ApiModelProperty(value = "药品代码", example = "模块1")
    private String code;
    /**
	 * 药品名称
	 * 药品中文名
	 */
	@ApiModelProperty(value = "药品名称", example = "")
	@ApiModelProperty(value = "药品中文名", example = "模块1")
    private String name;
    /**
	 * 药品规格
	 */
	@ApiModelProperty(value = "药品规格", example = "")
    private String physicSpec;
    /**
	 * 药品科目  科目类别字典中定义
	 */
	@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 = "模块1")
    private String subjectCode;
    /**
	 * 
	 * 药品剂型
	 */
	@ApiModelProperty(value = "", example = "")
    private String physicForm;
	@ApiModelProperty(value = "药品剂型", example = "模块1")
    private String dosageForm;
    /**
	 * 毒理分类  药品毒理分类字典中定义
	 * 药品规格
	 */
	@ApiModelProperty(value = "毒理分类  药品毒理分类字典中定义", example = "")
    private String toxicologyType;
	@ApiModelProperty(value = "药品规格", example = "模块1")
    private String specification;
    /**
	 * 基本药物标志  0：否；1：是
	 * 包装规格
	 */
	@ApiModelProperty(value = "基本药物标志  0：否；1：是", example = "1")
    private String basicFlag;
	@ApiModelProperty(value = "包装规格", example = "模块1")
    private String packingSpecification;
    /**
	 * 有效标志 0：无效；1：有效
	 * 适应症
	 */
	@ApiModelProperty(value = "有效标志 0：无效；1：有效", example = "0")
    private String validFlag;
	@ApiModelProperty(value = "适应症", example = "模块1")
    private String indication;
    /**
	 * 拼音首码
	 */
	@ApiModelProperty(value = "拼音首码", example = "")
	@ApiModelProperty(value = "拼音首码", example = "模块1")
    private String spellCode;
    /**
	 * 五笔首码
	 */
	@ApiModelProperty(value = "五笔首码", example = "")
	@ApiModelProperty(value = "五笔首码", example = "模块1")
    private String wbzxCode;
    /**
	 * 排序号
	 */
	@ApiModelProperty(value = "排序号", example = "")
	@ApiModelProperty(value = "排序号", example = "模块1")
    private Integer sequence;
    /**
	 * 2表示需要冷藏，其他表示不需要冷藏
	 */
	@ApiModelProperty(value = "2表示需要冷藏，其他表示不需要冷藏", example = "2")
	@ApiModelProperty(value = "2表示需要冷藏，其他表示不需要冷藏", example = "模块1")
    private String storageConditions;
@@ -149,88 +101,39 @@ public class DictMedicineVO extends IntegerIdentityVO{
        this.name = name;
    }
    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 String getSubjectCode() {
        return subjectCode;
    }
    public void setRetailPrice(double retailPrice) {
        this.retailPrice = retailPrice;
    public void setSubjectCode(String subjectCode) {
        this.subjectCode = subjectCode;
    }
    public String getPhysicForm() {
        return physicForm;
    public String getDosageForm() {
        return dosageForm;
    }
    public void setPhysicForm(String physicForm) {
        this.physicForm = physicForm;
    public void setDosageForm(String dosageForm) {
        this.dosageForm = dosageForm;
    }
    public String getToxicologyType() {
        return toxicologyType;
    public String getSpecification() {
        return specification;
    }
    public void setToxicologyType(String toxicologyType) {
        this.toxicologyType = toxicologyType;
    public void setSpecification(String specification) {
        this.specification = specification;
    }
    public String getBasicFlag() {
        return basicFlag;
    public String getPackingSpecification() {
        return packingSpecification;
    }
    public void setBasicFlag(String basicFlag) {
        this.basicFlag = basicFlag;
    public void setPackingSpecification(String packingSpecification) {
        this.packingSpecification = packingSpecification;
    }
    public String getValidFlag() {
        return validFlag;
    public String getIndication() {
        return indication;
    }
    public void setValidFlag(String validFlag) {
        this.validFlag = validFlag;
    public void setIndication(String indication) {
        this.indication = indication;
    }
    public String getSpellCode() {

sql/init.sql

@@ -323,8 +323,7 @@ CREATE TABLE `dict_medicine_distribute_org` (
  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
  `org_id` varchar(50) DEFAULT NULL COMMENT '机构编码',
  `medicine_code` varchar(50) DEFAULT NULL COMMENT '药品代码',
#   `disp_quantity_untuck_flag` int(10) DEFAULT NULL,
#   `disp_pack_untuck_flag` int(10) DEFAULT NULL,
  `quantity` int(10) DEFAULT NULL COMMENT '分发数量',
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='机构药品分发字典';
@@ -333,19 +332,12 @@ drop table IF EXISTS `dict_medicine`;
create table `dict_medicine`(
  `id` int(11) NOT NULL AUTO_INCREMENT 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 '剂量单位 计量单位字典中定义',
  `quantity_unit` varchar(50) DEFAULT NULL COMMENT '数量单位  计量单位字典中定义',
  `pack_unit` varchar(250) DEFAULT NULL COMMENT '包装单位   计量单位字典中定义',
  `min_dose` double(20,6) DEFAULT NULL COMMENT '最小剂量',
  `pack_spec` double(20,6) DEFAULT NULL,
  `retail_price` double(20,6) DEFAULT NULL COMMENT '零售价',
  `physic_form` varchar(50) DEFAULT NULL,
  `toxicology_type` varchar(250) DEFAULT NULL COMMENT '毒理分类  药品毒理分类字典中定义',
  `basic_flag` varchar(50) DEFAULT NULL COMMENT '基本药物标志  0：否；1：是',
  `valid_flag` varchar(50) DEFAULT NULL COMMENT '有效标志 0：无效；1：有效',
  `name` varchar(2000) DEFAULT NULL COMMENT '药品中文名',
  `subject_code` varchar(2000) DEFAULT NULL COMMENT '药品所属科目代码',
  `dosage_form` varchar(50) DEFAULT NULL COMMENT '药品剂型',
  `specification` varchar(200) DEFAULT NULL COMMENT '药品规格',
  `packing_specification` varchar(50) DEFAULT NULL COMMENT '包装规格',
  `indication` varchar(250) DEFAULT NULL COMMENT '适应症',
  `spell_code` varchar(200) DEFAULT NULL COMMENT '拼音首码',
  `wbzx_code` varchar(200) DEFAULT NULL COMMENT '五笔首码',
  `sequence` int(10) DEFAULT NULL COMMENT '排序号',
@@ -353,6 +345,28 @@ create table `dict_medicine`(
  PRIMARY KEY (`id`)
)ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='药品字典';
-- 药品剂型字典表（颗粒型，注射液，胶囊）
drop table IF EXISTS `dict_medicine_dosage_form`;
create table `dict_medicine_dosage_form`(
  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
  `code` varchar(50) DEFAULT NULL COMMENT '剂型代码',
  `name` varchar(2000) DEFAULT NULL COMMENT '剂型名称（颗粒型，注射液，胶囊等）',
  PRIMARY KEY (`id`)
)ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='药品剂型字典';
-- 药品科目类别表
drop table IF EXISTS `dict_medicine_subject`;
create table `dict_medicine_subject`(
  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
  `code` varchar(50) DEFAULT NULL COMMENT '类别代码',
  `name` varchar(2000) DEFAULT NULL COMMENT '类别名称',
  `parent_code` varchar(2000) DEFAULT NULL COMMENT '父类code',
  PRIMARY KEY (`id`)
)ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='药品科目类别字典';
-- ICD10表
drop table IF EXISTS `dict_icd10`;
CREATE TABLE `dict_icd10` (

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

@@ -12,7 +12,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  		2018年09月07日 	Created
 * litaohong 	1.0  		2018年09月11日 	Created
 *
 * </pre>
 * @since 1.

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

@@ -12,7 +12,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  		2018年09月07日 	Created
 * litaohong 	1.0  		2018年09月11日 	Created
 *
 * </pre>
 * @since 1.

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

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

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

@@ -0,0 +1,21 @@
package com.yihu.jw.base.dao.dict;
import com.yihu.jw.entity.base.dict.DictMedicineSubjectDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * 
 * 药品科目类别字典 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年09月11日 	Created
 *
 * </pre>
 * @since 1.
 */
public interface DictMedicineSubjectDao extends PagingAndSortingRepository<DictMedicineSubjectDO, Integer>, JpaSpecificationExecutor<DictMedicineSubjectDO>  {
}

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

@@ -1,4 +1,3 @@
/*
package com.yihu.jw.base.endpoint.dict;
import com.yihu.jw.base.service.dict.DictMedicineDistributeOrgService;
@@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
*/
/**
*
* 机构药品分发字典控制器
@@ -27,12 +25,11 @@ import java.util.List;
* @version
* <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  		2018年09月07日 	Created
 * litaohong 	1.0  		2018年09月11日 	Created
 *
 * </pre>
* @since 1.
*//*
*/
@RestController
@RequestMapping(value = BaseRequestMapping.DictMedicineDistributeOrg.PREFIX)
@Api(value = "机构药品分发字典管理", description = "机构药品分发字典管理服务接口", tags = {"wlyy基础服务 - 机构药品分发字典管理服务接口"})
@@ -105,4 +102,3 @@ public ObjEnvelop<DictMedicineDistributeOrgVO> create (
         }
 }
*/

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

@@ -0,0 +1,104 @@
package com.yihu.jw.base.endpoint.dict;
import com.yihu.jw.base.service.dict.DictMedicineDosageFormService;
import com.yihu.jw.entity.base.dict.DictMedicineDosageFormDO;
import com.yihu.jw.restmodel.base.dict.DictMedicineDosageFormVO;
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
 * litaohong 	1.0  		2018年09月11日 	Created
 *
 * </pre>
* @since 1.
*/
@RestController
@RequestMapping(value = BaseRequestMapping.DictMedicineDosageForm.PREFIX)
@Api(value = "药品剂型字典管理", description = "药品剂型字典管理服务接口", tags = {"wlyy基础服务 - 药品剂型字典管理服务接口"})
public class DictMedicineDosageFormEndpoint extends EnvelopRestEndpoint {
@Autowired
private DictMedicineDosageFormService dictMedicineDosageFormService;
@PostMapping(value = BaseRequestMapping.DictMedicineDosageForm.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<DictMedicineDosageFormVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    DictMedicineDosageFormDO dictMedicineDosageForm = toEntity(jsonData, DictMedicineDosageFormDO.class);
    dictMedicineDosageForm = dictMedicineDosageFormService.save(dictMedicineDosageForm);
    return success(dictMedicineDosageForm, DictMedicineDosageFormVO.class);
    }
    @PostMapping(value = BaseRequestMapping.DictMedicineDosageForm.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    dictMedicineDosageFormService.delete(ids.split(","));
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.DictMedicineDosageForm.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<DictMedicineDosageFormVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        DictMedicineDosageFormDO dictMedicineDosageForm = toEntity(jsonData, DictMedicineDosageFormDO.class);
        if (null == dictMedicineDosageForm.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
        dictMedicineDosageForm = dictMedicineDosageFormService.save(dictMedicineDosageForm);
        return success(dictMedicineDosageForm, DictMedicineDosageFormVO.class);
        }
        @GetMapping(value = BaseRequestMapping.DictMedicineDosageForm.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<DictMedicineDosageFormVO> 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<DictMedicineDosageFormDO> dictMedicineDosageForms = dictMedicineDosageFormService.search(fields, filters, sorts, page, size);
                int count = (int)dictMedicineDosageFormService.getCount(filters);
                return success(dictMedicineDosageForms, count, page, size, DictMedicineDosageFormVO.class);
         }
         @GetMapping(value = BaseRequestMapping.DictMedicineDosageForm.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<DictMedicineDosageFormVO> 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<DictMedicineDosageFormDO> dictMedicineDosageForms = dictMedicineDosageFormService.search(fields, filters, sorts);
                  return success(dictMedicineDosageForms, DictMedicineDosageFormVO.class);
         }
 }

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

@@ -1,6 +1,5 @@
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;
@@ -16,64 +15,64 @@ 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>
*
* 药品字典控制器
*
* @version
* <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  		2018年09月07日 	Created
 * litaohong 	1.0  		2018年09月11日 	Created
 *
 * </pre>
 * @since 1.
 */
* @since 1.
*/
@RestController
@RequestMapping(value = BaseRequestMapping.DictMedicine.PREFIX)
@Api(value = "药品字典管理", description = "药品字典管理服务接口", tags = {"wlyy基础服务 - 药品字典管理服务接口"})
public class DictMedicineEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private DictMedicineService dictMedicineService;
    @Autowired
    private DictMedicineDistributeOrgService dictMedicineDistributeOrgService;
@Autowired
private DictMedicineService dictMedicineService;
    @PostMapping(value = BaseRequestMapping.DictMedicine.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<DictMedicineVO> create(
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        DictMedicineDO dictMedicine = toEntity(jsonData, DictMedicineDO.class);
        dictMedicine = dictMedicineService.save(dictMedicine);
        return success(dictMedicine, DictMedicineVO.class);
@PostMapping(value = BaseRequestMapping.DictMedicine.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<DictMedicineVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    DictMedicineDO dictMedicine = toEntity(jsonData, DictMedicineDO.class);
    dictMedicine = dictMedicineService.save(dictMedicine);
    return success(dictMedicine, DictMedicineVO.class);
    }
    @PostMapping(value = BaseRequestMapping.DictMedicine.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        dictMedicineService.delete(ids.split(","));
        return success("删除成功");
    @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    dictMedicineService.delete(ids.split(","));
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.DictMedicine.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<DictMedicineVO> update(
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
    public ObjEnvelop<DictMedicineVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        DictMedicineDO dictMedicine = toEntity(jsonData, DictMedicineDO.class);
        if (null == dictMedicine.getId()) {
            return failed("ID不能为空", ObjEnvelop.class);
        return failed("ID不能为空", ObjEnvelop.class);
        }
        dictMedicine = dictMedicineService.save(dictMedicine);
        return success(dictMedicine, DictMedicineVO.class);
    }
        }
    @GetMapping(value = BaseRequestMapping.DictMedicine.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<DictMedicineVO> page(
        @GetMapping(value = BaseRequestMapping.DictMedicine.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<DictMedicineVO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -84,22 +83,22 @@ public class DictMedicineEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<DictMedicineDO> dictMedicines = dictMedicineService.search(fields, filters, sorts, page, size);
        int count = (int) dictMedicineService.getCount(filters);
        return success(dictMedicines, count, page, size, DictMedicineVO.class);
    }
            List<DictMedicineDO> dictMedicines = dictMedicineService.search(fields, filters, sorts, page, size);
                int count = (int)dictMedicineService.getCount(filters);
                return success(dictMedicines, count, page, size, DictMedicineVO.class);
         }
    @GetMapping(value = BaseRequestMapping.DictMedicine.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<DictMedicineVO> 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<DictMedicineDO> dictMedicines = dictMedicineService.search(fields, filters, sorts);
        return success(dictMedicines, DictMedicineVO.class);
    }
         @GetMapping(value = BaseRequestMapping.DictMedicine.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<DictMedicineVO> 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<DictMedicineDO> dictMedicines = dictMedicineService.search(fields, filters, sorts);
                  return success(dictMedicines, DictMedicineVO.class);
         }
}
 }

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

@@ -0,0 +1,104 @@
package com.yihu.jw.base.endpoint.dict;
import com.yihu.jw.base.service.dict.DictMedicineSubjectService;
import com.yihu.jw.entity.base.dict.DictMedicineSubjectDO;
import com.yihu.jw.restmodel.base.dict.DictMedicineSubjectVO;
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
 * litaohong 	1.0  		2018年09月11日 	Created
 *
 * </pre>
* @since 1.
*/
@RestController
@RequestMapping(value = BaseRequestMapping.DictMedicineSubject.PREFIX)
@Api(value = "药品科目类别字典管理", description = "药品科目类别字典管理服务接口", tags = {"wlyy基础服务 - 药品科目类别字典管理服务接口"})
public class DictMedicineSubjectEndpoint extends EnvelopRestEndpoint {
@Autowired
private DictMedicineSubjectService dictMedicineSubjectService;
@PostMapping(value = BaseRequestMapping.DictMedicineSubject.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<DictMedicineSubjectVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    DictMedicineSubjectDO dictMedicineSubject = toEntity(jsonData, DictMedicineSubjectDO.class);
    dictMedicineSubject = dictMedicineSubjectService.save(dictMedicineSubject);
    return success(dictMedicineSubject, DictMedicineSubjectVO.class);
    }
    @PostMapping(value = BaseRequestMapping.DictMedicineSubject.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    dictMedicineSubjectService.delete(ids.split(","));
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.DictMedicineSubject.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<DictMedicineSubjectVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        DictMedicineSubjectDO dictMedicineSubject = toEntity(jsonData, DictMedicineSubjectDO.class);
        if (null == dictMedicineSubject.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
        dictMedicineSubject = dictMedicineSubjectService.save(dictMedicineSubject);
        return success(dictMedicineSubject, DictMedicineSubjectVO.class);
        }
        @GetMapping(value = BaseRequestMapping.DictMedicineSubject.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<DictMedicineSubjectVO> 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<DictMedicineSubjectDO> dictMedicineSubjects = dictMedicineSubjectService.search(fields, filters, sorts, page, size);
                int count = (int)dictMedicineSubjectService.getCount(filters);
                return success(dictMedicineSubjects, count, page, size, DictMedicineSubjectVO.class);
         }
         @GetMapping(value = BaseRequestMapping.DictMedicineSubject.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<DictMedicineSubjectVO> 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<DictMedicineSubjectDO> dictMedicineSubjects = dictMedicineSubjectService.search(fields, filters, sorts);
                  return success(dictMedicineSubjects, DictMedicineSubjectVO.class);
         }
 }

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator    1.0  2018年09月07日 Created
 * litaohong    1.0  2018年09月11日 Created
 *
 * </pre>
 * @since 1.

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

@@ -0,0 +1,22 @@
package com.yihu.jw.base.service.dict;
import com.yihu.jw.base.dao.dict.DictMedicineDosageFormDao;
import com.yihu.jw.entity.base.dict.DictMedicineDosageFormDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * 
 * 药品剂型字典服务service
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong    1.0  2018年09月11日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class DictMedicineDosageFormService extends BaseJpaService<DictMedicineDosageFormDO, DictMedicineDosageFormDao> {
}

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

@@ -2,9 +2,7 @@ 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;
/**
@@ -14,12 +12,11 @@ import org.springframework.stereotype.Service;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator    1.0  2018年09月07日 Created
 * litaohong    1.0  2018年09月11日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class DictMedicineService extends BaseJpaService<DictMedicineDO, DictMedicineDao> {
}

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

@@ -0,0 +1,22 @@
package com.yihu.jw.base.service.dict;
import com.yihu.jw.base.dao.dict.DictMedicineSubjectDao;
import com.yihu.jw.entity.base.dict.DictMedicineSubjectDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * 
 * 药品科目类别字典服务service
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong    1.0  2018年09月11日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class DictMedicineSubjectService extends BaseJpaService<DictMedicineSubjectDO, DictMedicineSubjectDao> {
}