浏览代码

版本升级

liuqq 4 年之前
父节点
当前提交
b42fc40751

+ 16 - 16
src/main/java/com/diagbot/entity/MedLisResult.java

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -18,12 +18,12 @@ public class MedLisResult implements Serializable {
     /**
      * 报告单号
      */
-    private String repNo;
+    private String reptNo;
 
     /**
      * 医院ID
      */
-    private Integer hospitalId;
+    private Long hospitalId;
 
     /**
      * 住院病人ID
@@ -83,12 +83,12 @@ public class MedLisResult implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人,0表示无创建人值
@@ -100,18 +100,18 @@ public class MedLisResult implements Serializable {
      */
     private String modifier;
 
-    public String getRepNo() {
-        return repNo;
+    public String getReptNo() {
+        return reptNo;
     }
 
-    public void setRepNo(String repNo) {
-        this.repNo = repNo;
+    public void setReptNo(String reptNo) {
+        this.reptNo = reptNo;
     }
-    public Integer getHospitalId() {
+    public Long getHospitalId() {
         return hospitalId;
     }
 
-    public void setHospitalId(Integer hospitalId) {
+    public void setHospitalId(Long hospitalId) {
         this.hospitalId = hospitalId;
     }
     public String getBehospitalCode() {
@@ -191,18 +191,18 @@ public class MedLisResult implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -223,7 +223,7 @@ public class MedLisResult implements Serializable {
     @Override
     public String toString() {
         return "MedLisResult{" +
-            "repNo=" + repNo +
+            "repNo=" + reptNo +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
             ", itemCode=" + itemCode +

+ 16 - 16
src/main/java/com/diagbot/entity/MedPacsResult.java

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -18,12 +18,12 @@ public class MedPacsResult implements Serializable {
     /**
      * 报告单号
      */
-    private String repNo;
+    private String reptNo;
 
     /**
      * 医院ID
      */
-    private Integer hospitalId;
+    private Long hospitalId;
 
     /**
      * 住院病人ID
@@ -88,12 +88,12 @@ public class MedPacsResult implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人,0表示无创建人值
@@ -105,18 +105,18 @@ public class MedPacsResult implements Serializable {
      */
     private String modifier;
 
-    public String getRepNo() {
-        return repNo;
+    public String getReptNo() {
+        return reptNo;
     }
 
-    public void setRepNo(String repNo) {
-        this.repNo = repNo;
+    public void setReptNo(String reptNo) {
+        this.reptNo = reptNo;
     }
-    public Integer getHospitalId() {
+    public Long getHospitalId() {
         return hospitalId;
     }
 
-    public void setHospitalId(Integer hospitalId) {
+    public void setHospitalId(Long hospitalId) {
         this.hospitalId = hospitalId;
     }
     public String getBehospitalCode() {
@@ -203,18 +203,18 @@ public class MedPacsResult implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -235,7 +235,7 @@ public class MedPacsResult implements Serializable {
     @Override
     public String toString() {
         return "MedPacsResult{" +
-            "repNo=" + repNo +
+            "repNo=" + reptNo +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
             ", reptName=" + reptName +

+ 1 - 1
src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -468,7 +468,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     .in("rep_no", medLisInfoList.stream().map(i -> i.getRepNo()).collect(Collectors.toList()))
             );
             medLisResultList.forEach(medLisResult -> {
-                medLisResult.setItemName(repNoRepNameMap.get(medLisResult.getRepNo()) + "=" + medLisResult.getItemName());
+                medLisResult.setItemName(repNoRepNameMap.get(medLisResult.getReptNo()) + "=" + medLisResult.getItemName());
             });
         }
         return medLisResultList;