From 3631219246be48aec1e745e94e5b28ff4e8799c8 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 20 十月 2023 19:35:54 +0800
Subject: [PATCH] 调整上海原版接口

---
 igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java
index 8c57292..c272226 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java
@@ -1,6 +1,8 @@
 package com.ld.igds.models;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.persistence.Column;
@@ -8,6 +10,7 @@
 import javax.persistence.Id;
 import javax.persistence.Table;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 鐔忚捀澶囨鏂瑰紡琛�
@@ -20,21 +23,13 @@
 public class DrugLogWay implements Serializable {
 
     @Id
-    @Column(name = "ID_", length = 40)
-    @PropertyDef(label = "id")
-    private String id;
+    @Column(name = "WAY_ID_", length = 40)
+    @PropertyDef(label = "wayId")
+    private String wayId;
 
-    @Column(name = "DRUG_LOG_ID_", length = 4)
-    @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+    @Column(name = "DRUG_LOG_ID_", length = 12)
+    @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "濉姤鏃ユ湡yyyyMMdd+4浣嶉『搴忓彿")
     private String drugLogId;
-
-    @Column(name = "DEPT_ID_", length = 21)
-    @PropertyDef(label = "搴撳尯浠g爜")
-    private String deptId;
-
-    @Column(name = "COMPANY_ID_", length = 10)
-    @PropertyDef(label = "缁勭粐缂栫爜")
-    private String companyId;
 
     @Column(name = "xznd", precision = 20, scale = 3)
     @PropertyDef(label = "璁惧畾鐔忚捀娴撳害", description = "鍗曚綅锛歮l/m鲁")

--
Gitblit v1.9.3