Merge remote-tracking branch 'lis8.0/master'

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

@@ -0,0 +1,43 @@
+package com.czlis.liswork.controller.qc;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.lis.ComOpt;
+import com.czlis.liswork.service.QualitySetService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 质控设置
+ */
+@RestController
+@RequestMapping("/qc")
+@Slf4j
+@Api(tags = "质控设置界面")
+public class QualitySetController {
+
+    @Autowired
+    private QualitySetService qualitySetService;
+
+
+    @ApiOperation("保存数据")
+    @PostMapping("/saveOpt")
+    public Result saveOpt(@RequestBody List<ComOpt> comOptList){
+        return qualitySetService.saveOpt(comOptList);
+    }
+
+    @ApiOperation("保存质控项目数据")
+    @PostMapping("/saveQCItem")
+    public Result saveQCItem(){
+        //return qualitySetService.saveQCItem();
+        return null;
+    }
+
+}

liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComOptController.java

@@ -56,4 +56,10 @@ public class ComOptController extends BaseController {
         return comOptService.getdef(optiontype);
     }
 
+    @ApiOperation("查询某个参数的值")
+    @GetMapping("/queryValue")
+    public Result getComOptValue(String yq,String xxdh){
+        return comOptService.getComOptValue(yq,xxdh);
+    }
+
 }

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

@@ -12,4 +12,6 @@ public interface ComOptService {
     Result saveopt(List<ComConfigDict> posts);
     Result queryTree();
     Result getdef(String optiontype);
+
+    Result getComOptValue(String yq, String xxdh);
 }

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

@@ -0,0 +1,10 @@
+package com.czlis.liswork.service;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.lis.ComOpt;
+
+import java.util.List;
+
+public interface QualitySetService {
+    Result saveOpt(List<ComOpt> comOptList);
+}

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

@@ -0,0 +1,42 @@
+package com.czlis.liswork.service.impl.qc;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.lis.ComOpt;
+import com.czlis.common.utils.ComOptionUtils;
+import com.czlis.interfaceCommon.mapper.ComOptMapper;
+import com.czlis.liswork.service.QualitySetService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@Slf4j
+public class QualitySetServiceImpl implements QualitySetService {
+
+    @Autowired
+    ComOptMapper comOptMapper;
+
+    @Override
+    public Result saveOpt(List<ComOpt> comOptList) {
+        for (ComOpt comOpt : comOptList) {
+            String yq = comOpt.getYq();
+            String xxdh = comOpt.getXxdh();
+            if(yq == null) return new Result("-1","仪器参数不能为空！");
+            if(xxdh == null) return new Result("-1","参数代码不能为空！");
+            ComOpt comOptOne = comOptMapper.getComOptOne(yq, xxdh);
+            if(comOptOne == null) {
+                comOpt.setXxlb("QC");
+                comOpt.setXxdh("QCRULES");
+                comOpt.setBz("在用的质控规则");
+                comOptMapper.add(comOpt);
+            }else{
+                comOptMapper.update(comOpt);
+            }
+            //设置缓存
+            ComOptionUtils.setOptCache(yq, xxdh, comOpt);
+        }
+        return new Result("0","修改成功！");
+    }
+}

liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComOptServiceImpl.java

@@ -31,6 +31,13 @@ public class ComOptServiceImpl implements ComOptService {
         List<ComConfigDict> list=getconfigdef(optiontype);
         return new Result("0","成功",list);
     }
+
+    @Override
+    public Result getComOptValue(String yq, String xxdh) {
+        String value = commonUtil.getComOptValue(yq, xxdh);
+        return new Result("0","获取参数数据成功",value);
+    }
+
     @Override
     public Result getComOptList(String yq,String optiontype) {
         ComOpt comOpt=new ComOpt();

sql/lis8.0/updatedb_lis8.0.sql

@@ -410,3 +410,44 @@ if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS  WHERE TABLE_NAME = 'com_
         ALTER TABLE [dbo].[com_report_dict] ADD  DEFAULT ('') FOR [update_by];
         ALTER TABLE [dbo].[com_report_dict] ADD  DEFAULT (NULL) FOR [remark];
     end
+
+if not exists(select 1 from dbo.com_dict where zdlb = 'ZKGZ' and zddh = '1_2S')
+    begin
+        insert into com_dict(zdlb,zddh,zdmc,zjf,zdbz,bz,yljg)values('ZKGZ','1_2S','一个质控测定值超过X±2s质控限。传统上，这是作为Levey-Jennings质控图上的 警告限','','','','1')
+    end
+if not exists(select 1 from dbo.com_dict where zdlb = 'ZKGZ' and zddh = '1_3S')
+    begin
+        insert into com_dict(zdlb,zddh,zdmc,zjf,zdbz,bz,yljg)values('ZKGZ','1_3S','一个质控测定值超过X±3s质控限。传统上，这是作为Levey-Jennings质控图上的 失控限。','','','','1')
+    end
+if not exists(select 1 from dbo.com_dict where zdlb = 'ZKGZ' and zddh = '2_2S')
+    begin
+        insert into com_dict(zdlb,zddh,zdmc,zjf,zdbz,bz,yljg)values('ZKGZ','2_2S','两个连续的质控测定值同时超过X-2s 或X+2s质控限','','','','1')
+    end
+if not exists(select 1 from dbo.com_dict where zdlb = 'ZKGZ' and zddh = 'R4S')
+    begin
+        insert into com_dict(zdlb,zddh,zdmc,zjf,zdbz,bz,yljg)values('ZKGZ','R4S','在同一批内高和低质控测定值之间的差值超过4s','','','','1')
+    end
+if not exists(select 1 from dbo.com_dict where zdlb = 'ZKGZ' and zddh = '3_1S')
+    begin
+        insert into com_dict(zdlb,zddh,zdmc,zjf,zdbz,bz,yljg)values('ZKGZ','3_1S','三个连续的质控测定值同时超过X-1s 或X+1s','','','','1')
+    end
+if not exists(select 1 from dbo.com_dict where zdlb = 'ZKGZ' and zddh = '4_1S')
+    begin
+        insert into com_dict(zdlb,zddh,zdmc,zjf,zdbz,bz,yljg)values('ZKGZ','4_1S','四个连续的质控测定值同时超过X-1s 或X+1s','','','','1')
+    end
+if not exists(select 1 from dbo.com_dict where zdlb = 'ZKGZ' and zddh = '7T')
+    begin
+        insert into com_dict(zdlb,zddh,zdmc,zjf,zdbz,bz,yljg)values('ZKGZ','7T','七个连续的质控测定值呈现出向上或向下的趋势','','','','1')
+    end
+if not exists(select 1 from dbo.com_dict where zdlb = 'ZKGZ' and zddh = '8X')
+    begin
+        insert into com_dict(zdlb,zddh,zdmc,zjf,zdbz,bz,yljg)values('ZKGZ','8X','八个连续的质控测定值落在靶值（X）的同一侧','','','','1')
+    end
+if not exists(select 1 from dbo.com_dict where zdlb = 'ZKGZ' and zddh = '10X')
+    begin
+        insert into com_dict(zdlb,zddh,zdmc,zjf,zdbz,bz,yljg)values('ZKGZ','10X','十个连续的质控测定值落在靶值（X）的同一侧','','','','1')
+    end
+if not exists(select 1 from dbo.com_dict where zdlb = 'ZKGZ' and zddh = '12X')
+    begin
+        insert into com_dict(zdlb,zddh,zdmc,zjf,zdbz,bz,yljg)values('ZKGZ','12X','十二个连续的质控测定值落在靶值（X）的同一侧','','','','1')
+    end