质控参数维护

liswork/src/main/java/com/czlis/liswork/controller/qc/QualitySetController.java

@@ -5,7 +5,6 @@ import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.ComOpt;
 import com.czlis.common.core.domain.entity.lis.QcRules;
 import com.czlis.common.core.domain.entity.lis.QcSample;
-import com.czlis.common.core.domain.entity.lis.XmInfoNew;
 import com.czlis.common.enums.BusinessType;
 import com.czlis.interfaceCommon.constants.SysLogConstants;
 import com.czlis.liswork.pojo.DTO.QcRulesDTO;
@@ -69,7 +68,13 @@ public class QualitySetController {
     @PostMapping("/saveQcSample")
     public Result saveQcSample(@RequestBody QcSampleDTO qcSampleDTO){
         return qualitySetService.saveQcSample(qcSampleDTO);
+    }
 
+
+    @ApiOperation("/删除普通标本和质控标本对应关系")
+    @GetMapping("/deleteQcSample")
+    public Result deleteQcFromSample(String yq,String ybh){
+        return qualitySetService.deleteQcFromSample(yq,ybh);
     }
 
 }

liswork/src/main/java/com/czlis/liswork/service/QualitySetService.java

@@ -22,4 +22,6 @@ public interface QualitySetService {
     Result queryQcSample(QcSample qcSample);
 
     Result saveQcSample(QcSampleDTO qcSampleDTO);
+
+    Result deleteQcFromSample(String yq, String ybh);
 }

liswork/src/main/java/com/czlis/liswork/service/impl/qc/QualitySetServiceImpl.java

@@ -121,87 +121,38 @@ public class QualitySetServiceImpl implements QualitySetService {
     public Result saveQcSample(QcSampleDTO qcSampleDTO) {
         List<QcSample> qcSampleList = qcSampleDTO.getQcSampleList();
         List<QcFrmsmpl> qcFrmsmplList = qcSampleDTO.getQcFrmsmplList();
-        String yq = qcSampleDTO.getYq();
+        if(qcSampleList != null && !qcSampleList.isEmpty()){
-        for (QcSample qcSample : qcSampleList) {
+            for (QcSample qcSample : qcSampleList) {
-            QcSample qcSample1 = qcSampleMapper.queryOne(qcSample);
+                QcSample qcSample1 = qcSampleMapper.queryOne(qcSample);
-            if(qcSample1 == null){
+                if(qcSample1 == null){
-                qcSampleMapper.insert(qcSample);
+                    qcSampleMapper.insert(qcSample);
-            }else{
+                }else{
-                qcSampleMapper.update(qcSample);
+                    qcSampleMapper.update(qcSample);
+                }
             }
         }
 
-        for (QcFrmsmpl qcFrmsmpl : qcFrmsmplList) {
+        if(qcFrmsmplList != null && qcFrmsmplList.size() > 0){
-            QcFrmsmpl qcFrmsmpl1 = qcFrmsmplMapper.queryOne(qcFrmsmpl);
+            for (QcFrmsmpl qcFrmsmpl : qcFrmsmplList) {
-            if(qcFrmsmpl1 == null){
+                QcFrmsmpl qcFrmsmpl1 = qcFrmsmplMapper.queryOne(qcFrmsmpl);
-                qcFrmsmplMapper.insert(qcFrmsmpl);
+                if(qcFrmsmpl1 == null){
-            }else{
+                    qcFrmsmplMapper.insert(qcFrmsmpl);
-                qcFrmsmplMapper.update(qcFrmsmpl);
+                }else{
+                    qcFrmsmplMapper.update(qcFrmsmpl);
+                }
             }
         }
 
-        //保存参数设置
-        ComOpt comOpt = new ComOpt();
-        comOpt.setYq(yq);
-        comOpt.setXxlb("QC");
-        comOpt.setXxdh("QCSAMPLECNT");
-        comOpt.setXxqz(qcSampleDTO.getQCSAMPLECNT());
-        comOpt.setBz("质控品个数");
-        ComOpt comOptOne = comOptMapper.getComOptOne(yq, "QCSAMPLECNT");
-        if(comOptOne != null){
-            comOptMapper.update(comOpt);
-        }else{
-            comOptMapper.add(comOpt);
-        }
-        //设置缓存
-        ComOptionUtils.setOptCache(yq, "QCSAMPLECNT", comOpt);
-
-        ComOpt comOpt1 = new ComOpt(yq,"REFSAMPLENO","QC",qcSampleDTO.getREFSAMPLENO(),"每日报告参考标本号");
-        comOptOne = comOptMapper.getComOptOne(yq, "REFSAMPLENO");
-        if(comOptOne != null){
-            comOptMapper.update(comOpt1);
-        }else{
-            comOptMapper.add(comOpt1);
-        }
-        ComOptionUtils.setOptCache(yq, "REFSAMPLENO", comOpt1);
-
-        ComOpt comOpt2 = new ComOpt(yq,"QCMODE","QC",qcSampleDTO.getQCMODE(),"质控模式");
-        comOptOne = comOptMapper.getComOptOne(yq, "QCMODE");
-        if(comOptOne != null){
-            comOptMapper.update(comOpt2);
-        }else{
-            comOptMapper.add(comOpt2);
-        }
-        ComOptionUtils.setOptCache(yq, "QCMODE", comOpt2);
-
-        ComOpt comOpt3 = new ComOpt(yq,"qcdisplayotherdot","QC",qcSampleDTO.getQcdisplayotherdot(),"质控图显示非画图点");
-        comOptOne = comOptMapper.getComOptOne(yq, "qcdisplayotherdot");
-        if(comOptOne != null){
-            comOptMapper.update(comOpt3);
-        }else{
-            comOptMapper.add(comOpt3);
-        }
-        ComOptionUtils.setOptCache(yq, "qcdisplayotherdot", comOpt3);
-
-        ComOpt comOpt4 = new ComOpt(yq,"qcavesdbyph","QC",qcSampleDTO.getQcavesdbyph(),"质控图累积SD/CV值通过批号计算");
-        comOptOne = comOptMapper.getComOptOne(yq, "qcavesdbyph");
-        if(comOptOne != null){
-            comOptMapper.update(comOpt4);
-        }else{
-            comOptMapper.add(comOpt4);
-        }
-        ComOptionUtils.setOptCache(yq, "qcavesdbyph", comOpt4);
-
-        ComOpt comOpt5 = new ComOpt(yq,"qc_dotline","QC",qcSampleDTO.getQc_dotline(),"质控图是否画虚线");
-        comOptOne = comOptMapper.getComOptOne(yq, "qc_dotline");
-        if(comOptOne != null){
-            comOptMapper.update(comOpt5);
-        }else{
-            comOptMapper.add(comOpt5);
-        }
-        ComOptionUtils.setOptCache(yq, "qc_dotline", comOpt5);
-
 
         return new Result("0","保存数据成功！");
     }
+
+    @Override
+    public Result deleteQcFromSample(String yq, String ybh) {
+        QcFrmsmpl qcFrmsmpl = new QcFrmsmpl();
+        qcFrmsmpl.setYq(yq);
+        qcFrmsmpl.setYbh(ybh);
+        qcFrmsmplMapper.delete(qcFrmsmpl);
+        return new Result("0","删除成功！");
+    }
 }

liswork/src/main/resources/mapper/QcSampleMapper.xml

@@ -21,7 +21,7 @@
         <if test="qcsrc != null and qcsrc != ''">qcsrc,</if>
         <if test="expiredt != null ">expiredt,</if>
         <if test="qccv != null ">qccv,</if>
-        yq, xmdh, zkph, ksrq
+        yq, xmdh, zkph, ksrq)
         values(
         <if test="zkpph != null and zkpph != ''">#{zkpph},</if>
         <if test="ld != null and ld != ''">#{ld},</if>