add:规则知识：基础信息-医保药品目录

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/MedicalInsuranceDrugsController.java

@@ -50,7 +50,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class MedicalInsuranceDrugsController extends JeecgController<MedicalInsuranceDrugs, IMedicalInsuranceDrugsService> {
 	@Autowired
 	private IMedicalInsuranceDrugsService medicalInsuranceDrugsService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -72,7 +72,7 @@ public class MedicalInsuranceDrugsController extends JeecgController<MedicalInsu
 		IPage<MedicalInsuranceDrugs> pageList = medicalInsuranceDrugsService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -81,13 +81,13 @@ public class MedicalInsuranceDrugsController extends JeecgController<MedicalInsu
 	 */
 	@AutoLog(value = "medical_insurance_drugs-添加")
 	@ApiOperation(value="medical_insurance_drugs-添加", notes="medical_insurance_drugs-添加")
-	@RequiresPermissions("medical:medical_insurance_drugs:add")
+//	@RequiresPermissions("medical:medical_insurance_drugs:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody MedicalInsuranceDrugs medicalInsuranceDrugs) {
 		medicalInsuranceDrugsService.save(medicalInsuranceDrugs);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -96,13 +96,13 @@ public class MedicalInsuranceDrugsController extends JeecgController<MedicalInsu
 	 */
 	@AutoLog(value = "medical_insurance_drugs-编辑")
 	@ApiOperation(value="medical_insurance_drugs-编辑", notes="medical_insurance_drugs-编辑")
-	@RequiresPermissions("medical:medical_insurance_drugs:edit")
+//	@RequiresPermissions("medical:medical_insurance_drugs:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody MedicalInsuranceDrugs medicalInsuranceDrugs) {
 		medicalInsuranceDrugsService.updateById(medicalInsuranceDrugs);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -111,13 +111,13 @@ public class MedicalInsuranceDrugsController extends JeecgController<MedicalInsu
 	 */
 	@AutoLog(value = "medical_insurance_drugs-通过id删除")
 	@ApiOperation(value="medical_insurance_drugs-通过id删除", notes="medical_insurance_drugs-通过id删除")
-	@RequiresPermissions("medical:medical_insurance_drugs:delete")
+//	@RequiresPermissions("medical:medical_insurance_drugs:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		medicalInsuranceDrugsService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -126,13 +126,13 @@ public class MedicalInsuranceDrugsController extends JeecgController<MedicalInsu
 	 */
 	@AutoLog(value = "medical_insurance_drugs-批量删除")
 	@ApiOperation(value="medical_insurance_drugs-批量删除", notes="medical_insurance_drugs-批量删除")
-	@RequiresPermissions("medical:medical_insurance_drugs:deleteBatch")
+//	@RequiresPermissions("medical:medical_insurance_drugs:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.medicalInsuranceDrugsService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
@@ -156,7 +156,7 @@ public class MedicalInsuranceDrugsController extends JeecgController<MedicalInsu
     * @param request
     * @param medicalInsuranceDrugs
     */
-    @RequiresPermissions("medical:medical_insurance_drugs:exportXls")
+//    @RequiresPermissions("medical:medical_insurance_drugs:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, MedicalInsuranceDrugs medicalInsuranceDrugs) {
         return super.exportXls(request, medicalInsuranceDrugs, MedicalInsuranceDrugs.class, "medical_insurance_drugs");
@@ -169,7 +169,7 @@ public class MedicalInsuranceDrugsController extends JeecgController<MedicalInsu
     * @param response
     * @return
     */
-    @RequiresPermissions("medical:medical_insurance_drugs:importExcel")
+//    @RequiresPermissions("medical:medical_insurance_drugs:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, MedicalInsuranceDrugs.class);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MedicalInsuranceDrugs.java

@@ -32,22 +32,31 @@ import lombok.experimental.Accessors;
 public class MedicalInsuranceDrugs implements Serializable {
     private static final long serialVersionUID = 1L;
 
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
 	/**医保药品编码;医保目录药品编码*/
-	@Excel(name = "医保药品编码;医保目录药品编码", width = 15)
+	@Excel(name = "医保药品编码", width = 15)
     @ApiModelProperty(value = "医保药品编码;医保目录药品编码")
     private java.lang.String medicineCode;
 	/**医保药品名称;医保目录药品名称*/
-	@Excel(name = "医保药品名称;医保目录药品名称", width = 15)
+	@Excel(name = "医保药品名称", width = 15)
     @ApiModelProperty(value = "医保药品名称;医保目录药品名称")
     private java.lang.String medicineName;
 	/**医院项目编码;医嘱系统中药品的代码*/
-	@Excel(name = "医院项目编码;医嘱系统中药品的代码", width = 15)
+	@Excel(name = "医院项目编码", width = 15)
     @ApiModelProperty(value = "医院项目编码;医嘱系统中药品的代码")
     private java.lang.String itemIdHosp;
 	/**医院项目名称;医嘱系统中药品的名称*/
-	@Excel(name = "医院项目名称;医嘱系统中药品的名称", width = 15)
+	@Excel(name = "医院项目名称", width = 15)
     @ApiModelProperty(value = "医院项目名称;医嘱系统中药品的名称")
     private java.lang.Integer itemNameHosp;
+
+    @Excel(name = "医院药品名称", width = 15)
+    @ApiModelProperty(value = "医院药品名称")
+    private String medicinesNameHosp;
 	/**剂型*/
 	@Excel(name = "剂型", width = 15)
     @ApiModelProperty(value = "剂型")
@@ -65,32 +74,32 @@ public class MedicalInsuranceDrugs implements Serializable {
     @ApiModelProperty(value = "用量")
     private java.lang.String drugUseTotal;
 	/**自付比例;甲类为100%，乙类根据当地实际情况（80%，70%），丙类（0%）*/
-	@Excel(name = "自付比例;甲类为100%，乙类根据当地实际情况（80%，70%），丙类（0%）", width = 15)
+	@Excel(name = "自付比例", width = 15)
     @ApiModelProperty(value = "自付比例;甲类为100%，乙类根据当地实际情况（80%，70%），丙类（0%）")
     private java.lang.String pTypePct;
 	/**支付类别;指甲、乙、丙类*/
-	@Excel(name = "支付类别;指甲、乙、丙类", width = 15)
+	@Excel(name = "支付类别", width = 15)
     @ApiModelProperty(value = "支付类别;指甲、乙、丙类")
     private java.lang.String pCategory;
 	/**备注;药品使用范围、限制性范围备注*/
-	@Excel(name = "备注;药品使用范围、限制性范围备注", width = 15)
+	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注;药品使用范围、限制性范围备注")
     private java.lang.String remarks;
 	/**最高限价;物价规定的最高限价*/
-	@Excel(name = "最高限价;物价规定的最高限价", width = 15)
+	@Excel(name = "最高限价", width = 15)
     @ApiModelProperty(value = "最高限价;物价规定的最高限价")
     private java.math.BigDecimal cellingPrice;
 	/**三级医院最高价格;或其他定价规则体现下的最高级别定价*/
-	@Excel(name = "三级医院最高价格;或其他定价规则体现下的最高级别定价", width = 15)
+	@Excel(name = "三级医院最高价格", width = 15)
     @ApiModelProperty(value = "三级医院最高价格;或其他定价规则体现下的最高级别定价")
     private java.math.BigDecimal tertiaryHospPrice;
 	/**二级医院最高价格;或其他定价规则体现下的第二级别定价*/
-	@Excel(name = "二级医院最高价格;或其他定价规则体现下的第二级别定价", width = 15)
+	@Excel(name = "二级医院最高价格", width = 15)
     @ApiModelProperty(value = "二级医院最高价格;或其他定价规则体现下的第二级别定价")
     private java.math.BigDecimal twoHospPrice;
 	/**一级医院最高价格;或其他定价规则体现下的第三级别定价*/
-	@Excel(name = "一级医院最高价格;或其他定价规则体现下的第三级别定价", width = 15)
-    @ApiModelProperty(value = "一级医院最高价格;或其他定价规则体现下的第三级别定价")
+	@Excel(name = "一级医院最高价格", width = 15)
+    @ApiModelProperty(value = "一级医院最高价格")
     private java.math.BigDecimal oneHospPrice;
 	/**创建时间;*/
 	@JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")