diff --git a/lisresources/src/main/resources/jasperreports_extension.properties b/lisresources/src/main/resources/jasperreports_extension.properties
index b5931af..f927980 100644
--- a/lisresources/src/main/resources/jasperreports_extension.properties
+++ b/lisresources/src/main/resources/jasperreports_extension.properties
@@ -1,2 +1,3 @@
 net.sf.jasperreports.extension.registry.factory.simple.font.families=net.sf.jasperreports.engine.fonts.SimpleFontExtensionsRegistryFactory
-net.sf.jasperreports.extension.simple.font.families.lobstertwo=stsong/fonts.xml
\ No newline at end of file
+net.sf.jasperreports.extension.simple.font.families.lobstertwo=stsong/fonts.xml
+net.sf.jasperreports.extension.text.null.value=
\ No newline at end of file
diff --git a/liswork/src/main/java/com/czlis/liswork/controller/qc/QualitySetController.java b/liswork/src/main/java/com/czlis/liswork/controller/qc/QualitySetController.java
index 8bb1e85..6f472a4 100644
--- a/liswork/src/main/java/com/czlis/liswork/controller/qc/QualitySetController.java
+++ b/liswork/src/main/java/com/czlis/liswork/controller/qc/QualitySetController.java
@@ -36,12 +36,13 @@ public class QualitySetController {
     @ApiOperation("保存质控项目数据")
     @PostMapping("/saveQCItem")
     public Result saveQCItem(@RequestBody List<QcRulesDTO> QcRulesDTOList){
+        log.info("保存数据：{}",QcRulesDTOList);
         return qualitySetService.saveQCItem(QcRulesDTOList);
     }
 
     @ApiOperation("查询项目的质控规则")
     @GetMapping("/queryRules")
-    public Result queryRules(QcRules qcRules){
+    public Result queryRules(QcRules qcRules){;
         return qualitySetService.queryRules(qcRules);
     }
 
diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QualitySetServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QualitySetServiceImpl.java
index 899cf6e..dbbd3b8 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QualitySetServiceImpl.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QualitySetServiceImpl.java
@@ -75,13 +75,18 @@ public class QualitySetServiceImpl implements QualitySetService {
             reportItemMapper.updateXmInfoNew1(xmInfoNew);
 
             //保存质控规则
-            QcRules qcRules1 = qcRulesMapper.queryOne(qcRules);
-            if(qcRules1 == null) {
-                qcRulesMapper.insert(qcRules);
-            }else{
-                qcRulesMapper.update(qcRules);
+            if(qcRules != null){
+                if( qcRules.getYq() != null && qcRules.getXmdh() != null){
+                    QcRules qcRules1 = qcRulesMapper.queryOne(qcRules);
+                    if(qcRules1 == null) {
+                        qcRulesMapper.insert(qcRules);
+                    }else{
+                        qcRulesMapper.update(qcRules);
+                    }
+                }
             }
 
+
         }
         return new Result("0","修改数据成功！");
     }