提交merge1.3

openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/AllergyIntolerance.java

@@ -71,7 +71,7 @@ public class AllergyIntolerance extends HisBaseEntity {
     private Date recordedDate;
 
     /** 最后反应发生日期 */
-    private Date lastReactionOccurrence ;
+    private Date lastReactionOccurrence;
 
     /** 曝光路线 */
     private String exposureRoute;
@@ -82,4 +82,19 @@ public class AllergyIntolerance extends HisBaseEntity {
     /** 删除状态 */
     private String deleteFlag;
 
+    /**
+     * 药品定义id
+     */
+    private Long medicationId;
+
+    /**
+     * 批次号
+     */
+    private String lotNumber;
+
+    /**
+     * 就诊id
+     */
+    private Long encounterId;
+
 }