From dba871c46eb05394e22e4b7600183b7a44c28244 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 02 十一月 2023 08:48:38 +0800
Subject: [PATCH] 优化三维信息

---
 igds-recir/src/main/java/com/ld/igds/models/Drug.java |  131 +++++++++++++++++++++++++++++++++----------
 1 files changed, 99 insertions(+), 32 deletions(-)

diff --git a/igds-recir/src/main/java/com/ld/igds/models/Drug.java b/igds-recir/src/main/java/com/ld/igds/models/Drug.java
index e49c1f8..b15da85 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/Drug.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/Drug.java
@@ -1,5 +1,6 @@
 package com.ld.igds.models;
 
+import java.io.Serializable;
 import java.util.Date;
 
 import javax.persistence.Column;
@@ -7,57 +8,123 @@
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import com.bstek.dorado.annotation.PropertyDef;
 
 /**
  * 鐜祦鐔忚捀-鑽搧搴撳瓨
- * 
+ *
  * @ClassName: Drug
- * @date 2018骞�3鏈�9鏃� 涓嬪崍2:54:37
- * @version 1.0
+ * @date 2023骞�7鏈�26鏃�
  */
 @Data
 @Entity
 @Table(name = "D_DRUG")
-public class Drug {
+public class Drug implements Serializable {
 
-	@Id
-	@Column(name = "ID_", length = 40)
-	@PropertyDef(label = "缂栫爜")
-	private String id;
+    @Id
+    @Column(name = "ID_", length = 40)
+    @PropertyDef(label = "鑽墏缂栧彿", description = "搴撳尯浠g爜+涓変綅椤哄簭鍙�")
+    private String id;
 
-	@Column(name = "COMPANY_ID_", length = 10)
-	@PropertyDef(label = "缁勭粐缂栫爜")
-	private String companyId;
+    @Id
+    @Column(name = "DEPT_ID_", length = 50)
+    @PropertyDef(label = "搴撳尯浠g爜")
+    private String deptId;
 
-	@Column(name = "NAME_", length = 50)
-	@PropertyDef(label = "鑽搧鍚嶇О")
-	private String name;
+    @Id
+    @Column(name = "cgrq")
+    @PropertyDef(label = "閲囪喘鏃ユ湡")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date cgrq;
 
-	@Column(name = "SPEC_", length = 50)
-	@PropertyDef(label = "瑙勬牸璇存槑")
-	private String spec;
+    @Column(name = "DEPT_NAME_", length = 256)
+    @PropertyDef(label = "搴撳尯鍚嶇О")
+    private String deptName;
 
-	@Column(name = "DOSAGE_", length = 20)
-	@PropertyDef(label = "鍓傚瀷")
-	private String dosage;
+    @Column(name = "dwdm", length = 18)
+    @PropertyDef(label = "鍗曚綅浠g爜")
+    private String dwdm;
 
-	@Column(name = "COUNT_")
-	@PropertyDef(label = "搴撳瓨閲�")
-	private int count = 0;
+    @Column(name = "COMPANY_ID_", length = 10)
+    @PropertyDef(label = "缁勭粐缂栫爜")
+    private String companyId;
 
-	@PropertyDef(label = "鎿嶄綔鍛�")
-	@Column(name = "UPDATE_USER_", length = 30)
-	private String updateUser;
+    @Column(name = "NAME_", length = 50)
+    @PropertyDef(label = "鑽搧鍚嶇О")
+    private String name;
 
-	@PropertyDef(label = "鎿嶄綔鏃堕棿")
-	@Column(name = "UPDATE_TIME_")
-	private Date updateTime;
 
-	@PropertyDef(label = "鎿嶄綔鏃堕棿")
-	@Column(name = "REMARKS_", length = 300)
-	private String remarks;
+    @Column(name = "bzw", length = 1)
+    @PropertyDef(label = "鍖呰鐗�", description = "1锛氱摱瑁咃紝2锛氳瑁咃紝3锛氬叾浠�")
+    private String bzw;
+
+    @Column(name = "ggxh", length = 256)
+    @PropertyDef(label = "鍨嬪彿瑙勬牸", description = "濡傦細100mg/绮掓垨10g/鐗�")
+    private String ggxh;
+
+    @Column(name = "aqsysms", length = 1000)
+    @PropertyDef(label = "瀹夊叏浣跨敤璇存槑涔�")
+    private String aqsysms;
+
+    @Column(name = "sccj", length = 40)
+    @PropertyDef(label = "鐢熶骇鍘傚")
+    private String sccj;
+
+    @Column(name = "cgly", length = 40)
+    @PropertyDef(label = "閲囪喘鏉ユ簮")
+    private String cgly;
+
+    @Column(name = "cctj", length = 200)
+    @PropertyDef(label = "瀛樺偍鏉′欢")
+    private String cctj;
+
+    @Column(name = "ccdd", length = 1)
+    @PropertyDef(label = "鍌ㄥ瓨鍦扮偣", description = "1:鑽墏搴�,2:鍏朵粬")
+    private String ccdd;
+
+    @Column(name = "bzwclfs", length = 1000)
+    @PropertyDef(label = "鍖呰鐗╁鐞嗘柟寮�")
+    private String bzwclfs;
+
+    @Column(name = "czclfs", length = 1000)
+    @PropertyDef(label = "娈嬫福澶勭悊鏂瑰紡")
+    private String czclfs;
+
+    @Column(name = "bzq", length = 20)
+    @PropertyDef(label = "淇濊川鏈�")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date bzq;
+
+//    @Column(name = "SPEC_", length = 50)
+//    @PropertyDef(label = "瑙勬牸璇存槑")
+//    private String spec;
+
+    @Column(name = "DOSAGE_", length = 20)
+    @PropertyDef(label = "鍓傚瀷")
+    private String dosage;
+
+    @Column(name = "COUNT_")
+    @PropertyDef(label = "搴撳瓨閲�")
+    private Double count = 0.0;
+
+    @Column(name = "kcsldw", length = 1)
+    @PropertyDef(label = "搴撳瓨閲忓崟浣�", description = "1(榛樿)锛氬叕鏂わ紱2锛氬厠锛�3锛氭鍗囷紱")
+    private String kcsldw;
+
+
+    @PropertyDef(label = "鎿嶄綔鍛�")
+    @Column(name = "UPDATE_USER_", length = 30)
+    private String updateUser;
+
+    @PropertyDef(label = "鏇存柊鏃堕棿")
+    @Column(name = "UPDATE_TIME_")
+    private Date updateTime;
+
+    @PropertyDef(label = "澶囨敞")
+    @Column(name = "REMARKS_", length = 300)
+    private String remarks;
 
 }

--
Gitblit v1.9.3