医学规则测试

cdssman-service/src/main/java/com/diagbot/facade/ResultStaticKnowledgeFacade.java

@@ -111,7 +111,16 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
 
         List<ResultStaticKnowledge> saveList = Lists.newLinkedList();
         //从Excel读取数据
-        List<LisConfig> lisConfigList = ExcelUtils.importExcel(file, 0, 1, LisConfig.class);
+        List<LisConfig> lisConfigList = Lists.newLinkedList();
+        try {
+            lisConfigList = ExcelUtils.importExcel(file, 0, 1, LisConfig.class);
+        } catch (CommonException e) {
+            if (!e.getErrorCode().equals(CommonErrorCode.OK)) {
+                //终止运行
+                runningInfoVO.setStatus(0);
+                runningInfoFacade.updateStatus(runningInfoVO);
+            }
+        }
 
         Long hospitalId = testVO.getHospitalId();
         Date now = DateUtil.now();
@@ -301,7 +310,16 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
 
         List<ResultStaticKnowledge> saveList = Lists.newLinkedList();
         //从Excel读取数据
-        List<PacsConfig> pacsConfigList = ExcelUtils.importExcel(file, 0, 1, PacsConfig.class);
+        List<PacsConfig> pacsConfigList = Lists.newLinkedList();
+        try {
+            pacsConfigList = ExcelUtils.importExcel(file, 0, 1, PacsConfig.class);
+        } catch (CommonException e) {
+            if (!e.getErrorCode().equals(CommonErrorCode.OK)) {
+                //终止运行
+                runningInfoVO.setStatus(0);
+                runningInfoFacade.updateStatus(runningInfoVO);
+            }
+        }
 
         Long hospitalId = testVO.getHospitalId();
         Date now = DateUtil.now();
@@ -475,7 +493,16 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
 
         List<ResultStaticKnowledge> saveList = Lists.newLinkedList();
         //从Excel读取数据
-        List<DrugConfig> drugConfigList = ExcelUtils.importExcel(file, 1, 1, DrugConfig.class);
+        List<DrugConfig> drugConfigList = Lists.newLinkedList();
+        try {
+            drugConfigList = ExcelUtils.importExcel(file, 1, 1, DrugConfig.class);
+        } catch (CommonException e) {
+            if (!e.getErrorCode().equals(CommonErrorCode.OK)) {
+                //终止运行
+                runningInfoVO.setStatus(0);
+                runningInfoFacade.updateStatus(runningInfoVO);
+            }
+        }
 
         Long hospitalId = testVO.getHospitalId();
         Date now = DateUtil.now();
@@ -642,8 +669,18 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         runningInfoVO.setHospitalId(testVO.getHospitalId());
 
         List<ResultStaticKnowledge> saveList = Lists.newLinkedList();
+
         //从Excel读取数据
-        List<DiseaseConfig> diseaseConfigList = ExcelUtils.importExcel(file, 0, 1, DiseaseConfig.class);
+        List<DiseaseConfig> diseaseConfigList = Lists.newLinkedList();
+        try {
+            diseaseConfigList = ExcelUtils.importExcel(file, 0, 1, DiseaseConfig.class);
+        } catch (CommonException e) {
+            if (!e.getErrorCode().equals(CommonErrorCode.OK)) {
+                //终止运行
+                runningInfoVO.setStatus(0);
+                runningInfoFacade.updateStatus(runningInfoVO);
+            }
+        }
 
         Long hospitalId = testVO.getHospitalId();
         Date now = DateUtil.now();
@@ -784,7 +821,16 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
 
         List<ResultStaticKnowledge> saveList = Lists.newLinkedList();
         //从Excel读取数据
-        List<OperationConfig> operationConfigList = ExcelUtils.importExcel(file, 0, 1, OperationConfig.class);
+        List<OperationConfig> operationConfigList = Lists.newLinkedList();
+        try {
+            operationConfigList = ExcelUtils.importExcel(file, 0, 1, OperationConfig.class);
+        } catch (CommonException e) {
+            if (!e.getErrorCode().equals(CommonErrorCode.OK)) {
+                //终止运行
+                runningInfoVO.setStatus(0);
+                runningInfoFacade.updateStatus(runningInfoVO);
+            }
+        }
 
         Long hospitalId = testVO.getHospitalId();
         Date now = DateUtil.now();

cdssman-service/src/main/java/com/diagbot/vo/RunningInfoVO.java

@@ -29,6 +29,6 @@ public class RunningInfoVO {
     /**
      * 状态（1：运行中，0：非运行中）
      */
-    @ApiModelProperty(hidden = true)
+    //@ApiModelProperty(hidden = true)
     private Integer status;
 }

cdssman-service/src/main/java/com/diagbot/web/RunningInfoController.java

@@ -46,4 +46,15 @@ public class RunningInfoController {
         Map<Long, Integer> data = runningInfoFacade.getStatusByHospitalId(hospitalIdVO);
         return RespDTO.onSuc(data);
     }
+
+    @ApiOperation(value = "更新测试用例运行状态[zhaops]",
+            notes = "hospitalId： 医院Id <br>" +
+                    "caseId： 测试用例id<br>" +
+                    "status：状态（1：运行中，0：空闲）")
+    @PostMapping("/updateStatus")
+    @SysLogger("updateStatus")
+    public RespDTO<Boolean> updateStatus(@Valid @RequestBody RunningInfoVO runningInfoVO) {
+        Boolean data = runningInfoFacade.updateStatus(runningInfoVO);
+        return RespDTO.onSuc(data);
+    }
 }