Merge remote-tracking branch 'origin/master'

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmAlarmdetailNew.java

@@ -0,0 +1,15 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmAlarmdetailNew {
+    private Integer xmid;
+    private Integer seq;
+    private String samplecondition;
+    private String resultcondition;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoNew.java

@@ -70,5 +70,6 @@ public class XmInfoNew {
     private String val5;
     private String isWsw;
     private String inputcode;
+    private String jsxm;
 
 }

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmKnowledge.java

@@ -0,0 +1,28 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmKnowledge {
+    private String xmid;
+    private String xmdh;
+    private String xmmc;
+    private String xmlb;
+    private String xmz;
+    private String dw;
+    private BigDecimal cksx;
+    private BigDecimal ckxx;
+    private String dyckz;
+    private Integer dyxh;
+    private String jsgs;
+    private String lcyy;
+    private String bz;
+    private String zjf;
+    private String xsbz;
+}

liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java

@@ -4,13 +4,10 @@ import com.czlis.common.annotation.Anonymous;
 import com.czlis.common.annotation.Log;
 import com.czlis.common.core.controller.BaseController;
 import com.czlis.common.core.domain.Result;
-import com.czlis.common.core.domain.entity.lis.XmFilter;
+import com.czlis.common.core.domain.entity.lis.*;
-import com.czlis.common.core.domain.entity.lis.XmLot;
 import com.czlis.common.core.page.TableDataInfo;
 import com.czlis.common.enums.BusinessType;
 import com.czlis.liswork.pojo.DTO.XmInfoNewDTO;
-import com.czlis.common.core.domain.entity.lis.XmInfoNew;
-import com.czlis.common.core.domain.entity.lis.XmInfoVs;
 import com.czlis.liswork.service.ReportItemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -48,6 +45,12 @@ public class ReportItemController extends BaseController {
         return new Result("0","查询成功！",xmInfoNewDTO);
     }
 
+    @ApiOperation("查询项目基础信息")
+    @GetMapping("/queryXmInfoNew")
+    public Result queryXmInfoNew(XmInfoNew xmInfoNew) {
+        return reportItemService.queryXmInfoNew(xmInfoNew);
+    }
+
     @Log(title = "检验项目",businessType = BusinessType.INSERT)
     @ApiOperation("新增检验项目")
     @PostMapping("/add")
@@ -123,4 +126,23 @@ public class ReportItemController extends BaseController {
         return reportItemService.deleteXmLot(yq,sjph);
     }
 
+    @ApiOperation("获取危急值特定判断条件")
+    @GetMapping("/queryXmAlarmdetailNew")
+    public Result queryXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew){
+        return reportItemService.queryXmAlarmdetailNew(xmAlarmdetailNew);
+    }
+
+    @Log(title = "危急值特定判断条件",businessType = BusinessType.INSERT)
+    @ApiOperation("新增危急值特定判断条件")
+    @PostMapping("/addXmAlarmdetailNew")
+    public Result addXmAlarmdetailNew(@RequestBody List<XmAlarmdetailNew> xmAlarmdetailNew){
+        return reportItemService.addXmAlarmdetailNew(xmAlarmdetailNew);
+    }
+
+    @Log(title = "危急值特定判断条件",businessType = BusinessType.DELETE)
+    @ApiOperation("修改危急值特定判断条件")
+    @GetMapping("/delXmAlarmdetailNew")
+    public Result delXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew){
+        return reportItemService.delXmAlarmdetailNew(xmAlarmdetailNew);
+    }
 }

liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java

@@ -50,4 +50,12 @@ public interface ReportItemMapper {
     void addXmLot(XmLot xmLot);
 
     void deleteXmLot(@Param("yq") String yq,@Param("sjph") String sjph);
+
+    List<XmAlarmdetailNew> queryXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew);
+
+    void addXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew);
+
+    void updateXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew);
+
+    void delXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew);
 }

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

@@ -1,11 +1,8 @@
 package com.czlis.liswork.service;
 
 import com.czlis.common.core.domain.Result;
-import com.czlis.common.core.domain.entity.lis.XmFilter;
+import com.czlis.common.core.domain.entity.lis.*;
-import com.czlis.common.core.domain.entity.lis.XmLot;
 import com.czlis.liswork.pojo.DTO.XmInfoNewDTO;
-import com.czlis.common.core.domain.entity.lis.XmInfoNew;
-import com.czlis.common.core.domain.entity.lis.XmInfoVs;
 
 import java.util.List;
 
@@ -36,4 +33,12 @@ public interface ReportItemService {
     Result deleteXmLot(String yq, String sjph);
 
     List<XmInfoNew> query(XmInfoNew xmInfoNew);
+
+    Result queryXmInfoNew(XmInfoNew xmInfoNew);
+
+    Result queryXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew);
+
+    Result addXmAlarmdetailNew(List<XmAlarmdetailNew> xmAlarmdetailNew);
+
+    Result delXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew);
 }

liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java

@@ -213,5 +213,37 @@ public class ReportItemServiceImpl implements ReportItemService {
 
     }
 
+    @Override
+    public Result queryXmInfoNew(XmInfoNew xmInfoNew) {
+        List<XmInfoNew> xmInfoNewList = reportItemMapper.query(xmInfoNew);
+        return new Result("0","获取数据成功！",xmInfoNewList);
+    }
+
+    @Override
+    public Result queryXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew) {
+        List<XmAlarmdetailNew> xmAlarmdetailNewList = reportItemMapper.queryXmAlarmdetailNew(xmAlarmdetailNew);
+        return new Result("0","获取数据成功!",xmAlarmdetailNewList);
+    }
+
+    @Override
+    public Result addXmAlarmdetailNew(List<XmAlarmdetailNew> xmAlarmdetailNewList) {
+        for (XmAlarmdetailNew xmAlarmdetailNew : xmAlarmdetailNewList) {
+            List<XmAlarmdetailNew> xmAlarmdetailNewOneList = reportItemMapper.queryXmAlarmdetailNew(xmAlarmdetailNew);
+            log.info("列表数据个数：{}",xmAlarmdetailNewOneList.size());
+            if(xmAlarmdetailNewOneList.size() > 0){
+                reportItemMapper.updateXmAlarmdetailNew(xmAlarmdetailNew);
+            }else{
+                reportItemMapper.addXmAlarmdetailNew(xmAlarmdetailNew);
+            }
+        }
+        return new Result("0","变更数据成功！");
+    }
+
+    @Override
+    public Result delXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew) {
+        reportItemMapper.delXmAlarmdetailNew(xmAlarmdetailNew);
+        return new Result("0","删除数据成功！");
+    }
+
 
 }

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

@@ -565,4 +565,37 @@
     <delete id="deleteXmLot">
         delete from xm_log where yq = #{yq} and sjph = #{sjph}
     </delete>
+
+    <select id="queryXmAlarmdetailNew" resultType="com.czlis.common.core.domain.entity.lis.XmAlarmdetailNew">
+        select * from xm_alarmdetail_new
+        <where>
+            <if test="xmid != null">and xmid = #{xmid}</if>
+            <if test="seq != null">and seq = #{seq}</if>
+        </where>
+    </select>
+
+    <insert id="addXmAlarmdetailNew">
+        insert into xm_alarmdetail_new(
+        <if test="samplecondition != null and samplecondition != ''">samplecondition,</if>
+        <if test="resultcondition != null and resultcondition != ''">resultcondition,</if>
+        xmid, seq
+        )values(
+        <if test="samplecondition != null and samplecondition != ''">#{samplecondition},</if>
+        <if test="resultcondition != null and resultcondition != ''">#{resultcondition},</if>
+        #{xmid},#{seq})
+    </insert>
+
+    <update id="updateXmAlarmdetailNew">
+        update xm_alarmdetail_new
+        <set>
+            <if test="samplecondition != null and samplecondition != ''">samplecondition = #{samplecondition},</if>
+            <if test="resultcondition != null and resultcondition != ''">resultcondition = #{resultcondition},</if>
+            xmid = #{xmid}
+        </set>
+        where xmid = #{xmid} and seq = #{seq}
+    </update>
+
+    <delete id="delXmAlarmdetailNew">
+        delete from xm_alarmdetail_new where xmid = #{xmid} and seq = #{seq}
+    </delete>
 </mapper>