Merge branch 'develop' into dev/mapping_20210824

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

@@ -7,11 +7,7 @@ import com.diagbot.entity.KlConcept;
 import com.diagbot.entity.KlDiagnose;
 import com.diagbot.entity.KlDiagnoseRecord;
 import com.diagbot.entity.KlDiagnoseRecordDetail;
-import com.diagbot.enums.CommonEnum;
-import com.diagbot.enums.DiagnoseLexiconTypeEnum;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.LexiconEnum;
-import com.diagbot.enums.LexiconExtEnum;
+import com.diagbot.enums.*;
 import com.diagbot.service.KlConceptService;
 import com.diagbot.service.KlDiagnoseRecordDetailService;
 import com.diagbot.service.KlDiagnoseRecordService;
@@ -422,6 +418,7 @@ public class KlDiagnoseImportFacade {
         List<KlConcept> klConcepts
                 = klConceptService.list(new QueryWrapper<KlConcept>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("status", StatusEnum.Enable.getKey())
         );
         Map<String, KlConcept> map
                 = EntityUtil.makeEntityMapByKeys(klConcepts, "_", "libName", "libType");