From a605ec1f8e396b5af9f2b315efbf518301c14a3b Mon Sep 17 00:00:00 2001
From: jiangs <373297395@qq.com>
Date: Tue, 30 Dec 2025 14:56:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=8E=A7=E5=8F=82=E6=95=B0=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4,=E6=89=93=E5=8D=B0=E6=A8=A1=E7=89=88=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/jasperreports_extension.properties  |  3 ++-
 .../controller/qc/QualitySetController.java       |  3 ++-
 .../service/impl/qc/QualitySetServiceImpl.java    | 15 ++++++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

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","修改数据成功！");
     }