Explorar el Código

[task-1766] 性能验证模块 开发 (二期) / 【后端】验证报告的接口开发

Li Yuan hace 1 año
padre
commit
258314b81d

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/verification/controller/PerformanceVerificationController.java

@@ -96,7 +96,7 @@ public class PerformanceVerificationController extends GenericProvider {
                 }
             }
         }
-        return apiResult;
+        return null;
     }
 
     @PostMapping("/exportExcelReport")

+ 2 - 2
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/verification/excel/strategy/AbstractTemplateStrategy.java

@@ -36,7 +36,7 @@ public abstract class AbstractTemplateStrategy implements TemplateStrategy {
         buildTemplateHeader(entity);
         buildTemplateData(list);
 
-        ExportParams exportParams = new ExportParams(config.getName() + " 数据导入模板", config.getName());
+        ExportParams exportParams = new ExportParams(config.getName() + " 数据导入模板", config.getItemName());
         exportParams.setStyle(PVExcelExportStyler.class);
         exportParams.setType(ExcelType.XSSF);
 
@@ -48,7 +48,7 @@ public abstract class AbstractTemplateStrategy implements TemplateStrategy {
     @Override
     public double[][] parseData(ExcelSheetRecord2 record) {
         final List<Map> data = record.getData();
-        if (!config.getName().equals(record.getSheetName())) {
+        if (!config.getItemName().equals(record.getSheetName())) {
             record.getErrors().add(ExcelParserErrorEnum.IncorrectSheetName.getText());
             return null;
         }

+ 19 - 0
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/verification/model/InspectionConfigVO.java

@@ -8,6 +8,9 @@ public class InspectionConfigVO extends ConfigVO {
 
     //检测指标名称
     private String name;
+    private String key;
+
+    private String itemName;
     //单位
     private String units;
     //检验天数
@@ -162,4 +165,20 @@ public class InspectionConfigVO extends ConfigVO {
     public void setMethodName(String[] methodName) {
         this.methodName = methodName;
     }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
 }

+ 4 - 4
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/verification/model2/PVItemBuilder.java

@@ -92,13 +92,13 @@ public class PVItemBuilder {
 
     public PVModel buildPVModel(double[][] dataArrays) {
         PVModel pvModel;
-        if (config.getName().toLowerCase().contains("精密度")) {
+        if (config.getKey().equals("精密度验证")) {
             pvModel = new PrecisionEP15(dataArrays, config);
-        } else if (config.getName().equals("EP15-A2定值参考物质验证")) {
+        } else if (config.getKey().equals("使用定值参考物质验证")) {
             pvModel = new TruenessRefernece(dataArrays, config);
-        } else if (config.getName().equals("EP15-A2方法学比对")) {
+        } else if (config.getKey().equals("使用患者样品验证")) {
             pvModel = new TruenessEP15Patient(dataArrays, config);
-        } else if (config.getName().equals("EP6-A线性评价")) {
+        } else if (config.getKey().equals("408线性评价")) {
             pvModel = new LinearRangeEP6A(dataArrays, config);
         } else {
             return null;

+ 2 - 0
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/verification/service/impl/PerformanceVerificationServiceImpl.java

@@ -81,6 +81,8 @@ public class PerformanceVerificationServiceImpl implements PerformanceVerificati
         config.setName(experimentalPo.getFangAnLeiXing());
         config.setDecimal(Integer.valueOf(experimentalPo.getBaoLiuXiaoShu()));
         config.setUnits(experimentalPo.getJieGuoDanWei());
+        config.setKey(experimentalPo.getFangFaKey());
+        config.setItemName(experimentalPo.getShiYanXiangMu());
         if (ArrayUtils.isEmpty(config.getSpecimensName())) {
             String[] names = new String[config.getSpecimensNum()];
             for (int i = 0; i < config.getSpecimensNum(); i++) {