药品相关

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

@@ -65,7 +65,7 @@ public class MedicineController extends JeecgController<Medicine, IMedicineServi
 	 */
 	//@AutoLog(value = "medicine-分页列表查询")
 	@ApiOperation(value="medicine-分页列表查询", notes="medicine-分页列表查询")
-	@GetMapping(value = {"/list", "/list/{sourceType}"})
+	@GetMapping(value = "/list")
 	public Result<IPage<Medicine>> queryPageList(Medicine medicine,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,

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

@@ -33,9 +33,9 @@ public class Medicine implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**药品ID*/
-    @TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "药品ID")
-    private java.lang.String id;
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "主键ID")
+    private java.lang.Integer id;
 
     /**项目编码*/
     @Excel(name = "项目编码", width = 15)

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

@@ -26,9 +26,9 @@ import java.io.Serializable;
 public class OtherMedicine implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @TableId(type = IdType.ASSIGN_ID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "药品ID")
-    private java.lang.String id;
+    private java.lang.Integer id;
     @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private String remark;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/MedicineServiceImpl.java

@@ -125,7 +125,8 @@ public class MedicineServiceImpl extends ServiceImpl<MedicineMapper, Medicine> i
                 long start = System.currentTimeMillis();
                 if (!CollectionUtils.isEmpty(instalList)) {
                     addNumber = instalList.size();
-                    this.saveBatch(instalList, 500);
+//                    this.saveBatch(instalList, 500);
+                    this.saveBatch(instalList);
                 }
                 log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
                 //update-end-author:taoyan date:20190528 for:批量插入数据