配置更新

kernel/src/main/java/com/lantone/qc/kernel/analysis/QCAnalysis.java

@@ -36,7 +36,7 @@ public class QCAnalysis {
     SimilarityServiceClient similarityServiceClient;
 
     public OutputInfo anlysis(QueryVo queryVo) throws AIException, CatalogueException, Exception {
-        log.error("json:"+ FastJsonUtils.getBeanToJson(queryVo));
+        log.error("json:" + FastJsonUtils.getBeanToJson(queryVo));
         specialStorageUtil.getHospitalIdThreadLocal().set(queryVo.getHospitalId());
         specialStorageUtil.getBehospitalInfoThreadLocal().set(queryVo.getBehospitalInfo());
         OutputInfo outputInfo = new OutputInfo();
@@ -55,10 +55,16 @@ public class QCAnalysis {
         }
         long t3 = System.currentTimeMillis();
         for (Map.Entry<String, Map<String, String>> entry : inputInfo.getInputCatalogueMap().entrySet()) {
-            if (CatalogueUtil.qcCatalogueMap.get(queryVo.getCid() + "." + entry.getKey()) == null) {
-                continue;
+//            if (CatalogueUtil.qcCatalogueMap.get(queryVo.getCid() + "." + entry.getKey()) == null) {
+//                continue;
+//            }
+//            CatalogueUtil.qcCatalogueMap.get(queryVo.getCid() + "." + entry.getKey()).execute(inputInfo, outputInfo);
+            if (CatalogueUtil.qcCatalogueMap.get(queryVo.getCid() + "." + entry.getKey()) != null) {
+                CatalogueUtil.qcCatalogueMap.get(queryVo.getCid() + "." + entry.getKey()).execute(inputInfo, outputInfo);
+            } else if (CatalogueUtil.qcCatalogueMap.get(entry.getKey()) != null) {
+                CatalogueUtil.qcCatalogueMap.get(entry.getKey()).execute(inputInfo, outputInfo);
             }
-            CatalogueUtil.qcCatalogueMap.get(queryVo.getCid() + "." + entry.getKey()).execute(inputInfo, outputInfo);
+
         }
         //        inputInfo.getInputCatalogueMap().entrySet().parallelStream().forEach(entry -> {
         //            if (CatalogueUtil.qcCatalogueMap.get(entry.getKey()) != null) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/QCCatalogue.java

@@ -97,8 +97,13 @@ public class QCCatalogue {
     private String className = this.getClass().getSimpleName();
 
     public QCCatalogue() {
-        String keyName = this.getClass().getName().substring(32);
-        keyName = keyName.substring(0, keyName.indexOf(".") + 1) + className;
+        String keyName = className;
+        String pathName = this.getClass().getName().substring(32);
+        String hospital = pathName.substring(0, pathName.indexOf(".") + 1);
+        if ("hospital.".equals(hospital)) {
+            String replace = pathName.replace(hospital, "");
+            keyName = replace.substring(0, replace.indexOf(".") + 1) + className;
+        }
         CatalogueUtil.qcCatalogueMap.put(keyName, this);
     }