后端最新版本同步

openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatistics.java

@@ -31,19 +31,15 @@ public class DocStatistics extends HisBaseEntity {
     /**
      * 记录科室ID
      */
-    private Long orgnizationId;
+    private Long organizationId;
     /**
      * 统计值
      */
     private String value;
-    /**
-     * 记录日期 yyyy-MM-dd
-     */
-    private Date recordingDate;
     /**
      * 记录时间 yyyy-MM-dd HH:mm:ss
      */
-    private Date recordingTime;
+    private Date recordTime;
     /**
      * 记录来源
      */

openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocTemplate.java

@@ -2,6 +2,7 @@ package com.openhis.document.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;