diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisRule.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisRule.java
index e8010650..57a527ca 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisRule.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisRule.java
@@ -1,21 +1,11 @@
package org.jeecg.modules.base.entity.postgre;
-import java.io.Serializable;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.scheduling.annotation.Scheduled;
@Data
@TableName("alarm_analysis_rule")
@@ -47,6 +37,39 @@ public class AlarmAnalysisRule extends JeecgEntity {
/** 联系人组id */
private String contactGroup;
+ private String colTime;
+
+ private String acqTime;
+
+ private Double airFlow;
+
+ private Double decayTime;
+
+ private Double sampVol;
+
+ @TableField("ba140_mdc")
+ private Double ba140MDC;
+
+ @TableField("be7_fwhm")
+ private Double be7FWHM;
+
+ @TableField("xe133_mdc")
+ private String xe133MDC;
+
+ @TableField("xe_vol")
+ private Double xeVol;
+
+ @TableField("xe131m_flag")
+ private Integer xe131mFlag;
+
+ @TableField("xe133m_flag")
+ private Integer xe133mFlag;
+
+ @TableField("xe133_flag")
+ private Integer xe133Flag;
+
+ @TableField("xe135_flag")
+ private Integer xe135Flag;
/** 备注 */
private String remark;
}
diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedAutoMapper.xml b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedAutoMapper.xml
index c9c2755a..12e27727 100644
--- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedAutoMapper.xml
+++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedAutoMapper.xml
@@ -10,6 +10,7 @@
RNAUTO.GARDS_NUCL_IDED nucl
INNER JOIN RNAUTO.GARDS_ANALYSES ana ON ana.IDANALYSIS = nucl.IDANALYSIS
INNER JOIN ORIGINAL.GARDS_SAMPLE_DATA samp ON samp.SAMPLE_ID = nucl.SAMPLE_ID
+ INNER JOIN RNAUTO.GARDS_QC_CHECK qc ON samp.SAMPLE_ID = qc.SAMPLE_ID
ana.ANALYSISBEGIN BETWEEN to_date(#{startDate},'yyyy-mm-dd hh24:mi:ss')
AND to_date(#{endDate},'yyyy-mm-dd hh24:mi:ss')
@@ -21,6 +22,30 @@
#{item}
+
+ AND (qc.qc_name = 'col_time' and qc.qc_value between #{colTime[0]} and #{colTime[1]} )
+
+
+ AND (qc.qc_name = 'acq_time' and qc.qc_value between #{acqTime[0]} and #{acqTime[1]} )
+
+
+ AND (qc.qc_name = 'air_flow' and qc.qc_value < #{airFlow} )
+
+
+ AND (qc.qc_name = 'decay_time' and qc.qc_value < #{decayTime} )
+
+
+ AND (qc.qc_name = 'samp_vol' and qc.qc_value < #{sampVol} )
+
+
+ AND (qc.qc_name = 'Be7-FWHM' and qc.qc_value < #{be7FWHM} )
+
+
+ AND (qc.qc_name = 'Ba140-MDC' and qc.qc_value < #{ba140MDC} )
+
+
+ AND (qc.qc_name = 'Xe133-MDC' and qc.qc_value < #{xe133MDC} )
+