规则基类修改

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

@@ -3,9 +3,6 @@ package com.lantone.qc.kernel.catalogue;
 import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -16,15 +13,19 @@ import java.util.Map;
  * @Date: 2020-03-04 11:24
  */
 public class QCCatalogue {
-    protected Map<String, QCCatalogue> qcCatalogueMap = CatalogueUtil.qcCatalogueMap;
+
+    public QCCatalogue() {
+        String className = this.getClass().getName();
+        CatalogueUtil.qcCatalogueMap.put(className.substring(className.lastIndexOf(".") + 1), this);
+    }
+
     /**
-     *
-     * @return  如
+     * @return 如
      * {
-     *     "BEH001":{"status":"-1", "info": "发热"}
+     * "BEH001":{"status":"-1", "info": "发热"}
      * }
      */
     public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
+    }
 
-    };
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0001.java

@@ -17,9 +17,6 @@ import java.util.Map;
  */
 @Component
 public class BEH0001 extends QCCatalogue {
-    public BEH0001() {
-        qcCatalogueMap.put("BEH0001", this);
-    }
     public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
         System.out.println("111111111");
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0299.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.clinicalblood;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,6 +13,7 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
+@Component
 public class CLI0299 extends QCCatalogue {
     public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0280.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.consultation;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,6 +13,7 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
+@Component
 public class CON0280 extends QCCatalogue {
     public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/deathcasediscuss/CON0280.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.deathcasediscuss;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
-public class CON0280 extends QCCatalogue {
+@Component
+public class DEA0097 extends QCCatalogue {
     public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/deathrecord/CON0280.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.deathrecord;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
-public class CON0280 extends QCCatalogue {
+@Component
+public class DEA0337 extends QCCatalogue {
     public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/difficultcasediscuss/CON0280.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.difficultcasediscuss;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
-public class CON0280 extends QCCatalogue {
+@Component
+public class DIF0280 extends QCCatalogue {
     public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/dutyshiftsystem/CON0280.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.dutyshiftsystem;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
-public class CON0280 extends QCCatalogue {
+@Component
+public class DUT0280 extends QCCatalogue {
     public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/CON0280.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.firstcourserecord;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
-public class CON0280 extends QCCatalogue {
+@Component
+public class FIR0083 extends QCCatalogue {
     public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/CON0280.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.firstpagerecord;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
-public class CON0280 extends QCCatalogue {
+@Component
+public class FIR0157 extends QCCatalogue {
     public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/CON0280.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.leavehospital;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
-public class CON0280 extends QCCatalogue {
+@Component
+public class LEA0280 extends QCCatalogue {
     public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/nursingsystem/NUR0293.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.nursingsystem;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,6 +13,7 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
+@Component
 public class NUR0293 extends QCCatalogue {
     public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0310.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.operationdiscussion;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,6 +13,7 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
+@Component
 public class OPE0310 extends QCCatalogue {
     public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0328.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.preoperativediscussion;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,6 +13,7 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
+@Component
 public class PRE0328 extends QCCatalogue {
     public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0122.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.threelevelward;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,6 +13,7 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
+@Component
 public class THR0122 extends QCCatalogue {
     public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
     }

kernel/src/main/java/com/lantone/qc/kernel/web/controller/QCController.java

@@ -1,20 +1,17 @@
 package com.lantone.qc.kernel.web.controller;
 
 import com.lantone.qc.kernel.analysis.QCAnalysis;
+import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.vo.QueryVo;
 import com.lantone.qc.pub.res.Response;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Map;
-
 /**
  * @ClassName : QCController
  * @Description : 质控总入口
@@ -28,12 +25,13 @@ public class QCController {
 
     @Autowired
     private QCAnalysis qCAnalysis;
+
     @ApiOperation(value = "质控外部接口，需要token信息", notes = "")
     @PostMapping("rec")
-    public Response<Map<String, Object>> extract(@RequestBody QueryVo queryVo) {
+    public Response<OutputInfo> extract(@RequestBody QueryVo queryVo) {
         Response response = new Response();
-        qCAnalysis.anlysis(queryVo);
+        response.setData(qCAnalysis.anlysis(queryVo));
         return response;
     }
-    
+
 }