Merge remote-tracking branch 'origin/dev/importDiagnose20210429' into dev/importDiagnose20210429

src/main/java/com/diagbot/entity/KlDiagnoseBase.java

@@ -49,11 +49,6 @@ public class KlDiagnoseBase implements Serializable {
      */
     private String modifier;
 
-    /**
-     * 提示概念id
-     */
-    private Long conceptId;
-
     /**
      * 描述
      */
@@ -109,10 +104,6 @@ public class KlDiagnoseBase implements Serializable {
      */
     private String eqUnit;
 
-    /**
-     * 启用状态（0：禁用，1：启用）
-     */
-    private Integer status;
 
     public Long getId() {
         return id;
@@ -162,14 +153,6 @@ public class KlDiagnoseBase implements Serializable {
         this.modifier = modifier;
     }
 
-    public Long getConceptId() {
-        return conceptId;
-    }
-
-    public void setConceptId(Long conceptId) {
-        this.conceptId = conceptId;
-    }
-
     public String getDescription() {
         return description;
     }
@@ -258,14 +241,6 @@ public class KlDiagnoseBase implements Serializable {
         this.eqUnit = eqUnit;
     }
 
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
     @Override
     public String toString() {
         return "KlDiagnoseBase{" +
@@ -275,7 +250,6 @@ public class KlDiagnoseBase implements Serializable {
                 ", gmtModified=" + gmtModified +
                 ", creator=" + creator +
                 ", modifier=" + modifier +
-                ", conceptId=" + conceptId +
                 ", description=" + description +
                 ", type=" + type +
                 ", minOperator=" + minOperator +
@@ -287,7 +261,6 @@ public class KlDiagnoseBase implements Serializable {
                 ", eqOperator=" + eqOperator +
                 ", eqValue=" + eqValue +
                 ", eqUnit=" + eqUnit +
-                ", status=" + status +
                 "}";
     }
 }

src/main/java/com/diagbot/facade/KlDiagnoseFacade.java

@@ -284,7 +284,6 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
                                 klDiagnoseBase.setMinOperator(detailVO.getMinOperator());
                                 klDiagnoseBase.setMinValue(detailVO.getMinVal());
                                 klDiagnoseBase.setMinUnit(detailVO.getMinUnit());
-                                klDiagnoseBase.setStatus(1);
                                 klDiagnoseBase.setEqValue(detailVO.getEqValue());
                                 klDiagnoseBase.setEqOperator(detailVO.getEqOperator());
                                 klDiagnoseBase.setEqUnit(detailVO.getEqUnit());