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

@@ -1,41 +0,0 @@
-package com.czlis.common.core.domain.entity.lis;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class LabPatwarning {
-
-  private Date jyrq;
-  private String yq;
-  private String ybh;
-  private String lb;
-  private String bgr;
-  private String btzr;
-  private String tzfs;
-  private Date tzsj;
-  private String bz;
-  private String qrr;
-  private Date qrsj;
-  private String qrr1;
-  private Date qrsj1;
-  private String zt;
-  private String tbr;
-  private Date tbsj;
-  private String fhzt;
-  private String fhyy;
-  private String fhr;
-  private Date fhsj;
-  private String jtr;
-  private String lrr;
-  private Date lrsj;
-  private String phone;
-
-
-
-}

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

@@ -1,24 +0,0 @@
-package com.czlis.common.core.domain.entity.lis;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class LabResultwarning {
-
-  private Date jyrq;
-  private String yq;
-  private String ybh;
-  private String xmdh;
-  private String csjg;
-  private String jgbz;
-  private String bz;
-
-
-
-}

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

@@ -1,48 +0,0 @@
-package com.czlis.common.core.domain.entity.lis;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class LisPatlog {
-
-  private String wyh;
-  private Date jyrq;
-  private String yq;
-  private String ybh;
-  private Date xgrq;
-  private String xgyhdh;
-  private String yblx;
-  private String fb;
-  private String ksdh;
-  private String sjys;
-  private String hdys;
-  private String yhdh;
-  private String brdh;
-  private String brxm;
-  private String brxb;
-  private String brly;
-  private String ch;
-  private Integer nl;
-  private String nldw;
-  private String sqh;
-  private Date sqsj;
-  private Date dysj;
-  private String dybz;
-  private String jgbz;
-  private String bbbz;
-  private String zd;
-  private String bz;
-  private String bz1;
-  private String zjf;
-  private Date cyrq;
-  private String bq;
-  private String czybh;
-
-
-}

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatwarningMapper.java

@@ -1,13 +0,0 @@
-package com.czlis.interfaceCommon.mapper;
-
-import com.czlis.common.core.domain.entity.lis.LabPatwarning;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Date;
-import java.util.List;
-
-public interface LabPatwarningMapper {
-    LabPatwarning getLabPatwarning(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh") String ybh);
-    int insertLabPatwarning(LabPatwarning labPatwarning);
-    int deleteLabPatwarning(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh") String ybh);
-}

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReqreportPdffileMapper.java

@@ -9,5 +9,4 @@ import java.util.List;
 public interface LabReqreportPdffileMapper {
     List<LabReqreportPdffile> getLabReqreportPdffileList(String sqh);
     LabReqreportPdffile getLabReqreportPdffileOne(@Param("jyrq") Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh);
-    int deleteLabReqreportPdffile(@Param("jyrq") Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh);
 }

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabResultwarningMapper.java

@@ -1,13 +0,0 @@
-package com.czlis.interfaceCommon.mapper;
-
-import com.czlis.common.core.domain.entity.lis.LabResultwarning;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Date;
-import java.util.List;
-
-public interface LabResultwarningMapper {
-    List<LabResultwarning> getLabResultwarning(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh") String ybh);
-    int insertLabResultwarning(LabResultwarning labResultwarning);
-    int deleteLabResultwarning(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh") String ybh);
-}

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LisPatlogMapper.java

@@ -1,13 +0,0 @@
-package com.czlis.interfaceCommon.mapper;
-
-import com.czlis.common.core.domain.entity.lis.LisPatlog;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Date;
-import java.util.List;
-
-public interface LisPatlogMapper {
-    List<LisPatlog>  getLisPatlogList(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh") String ybh);
-    List<LisPatlog>  getLisPatlog(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh") String ybh,@Param("xgrq") Date xgrq);
-    int  insertLisPatlog(LisPatlog lisPatlog);
-}

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java

@@ -32,10 +32,6 @@ public class CommonUtil {
     @Autowired
     LabResultMapper labResultMapper;
     @Autowired
-    LabResultwarningMapper labResultwarningMapper;
-    @Autowired
-    LabPatwarningMapper labPatwarningMapper;
-    @Autowired
     LabReqdetailMapper labReqdetailMapper;
     @Autowired
     ComUsrMapper comUsrMapper;
@@ -61,8 +57,6 @@ public class CommonUtil {
     LabRefusedMapper labRefusedMapper;
     @Autowired
     XmCalcMapper xmCalcMapper;
-    @Autowired
-    LisPatlogMapper lisPatlogMapper;
 
     //====检验主表操作方法集合===
     public LabPat getLabPatOne(Date jyrq, String yq, String ybh) {
@@ -167,30 +161,6 @@ public class CommonUtil {
     public int updateLabResult(LabResult labResult) {
         return labResultMapper.updateLabResult(labResult);
     }
-    //======危急值操作集合=======
-    public List<LabResultwarning> getLabResultwarning(Date jyrq, String yq, String ybh) {
-        return labResultwarningMapper.getLabResultwarning(jyrq, yq, ybh);
-    }
-    public LabPatwarning getLabPatwarning(Date jyrq, String yq, String ybh) {
-        return labPatwarningMapper.getLabPatwarning(jyrq, yq, ybh);
-    }
-    @Transactional(rollbackFor = Exception.class)
-    public void insertLabResultwarning(LabResultwarning labResultwarning) {
-        labResultwarningMapper.insertLabResultwarning(labResultwarning);
-    }
-    @Transactional(rollbackFor = Exception.class)
-    public void insertLabPatwarning(LabPatwarning labPatwarning) {
-        labPatwarningMapper.insertLabPatwarning(labPatwarning);
-    }
-    @Transactional(rollbackFor = Exception.class)
-    public void deleteLabPatwarning(Date jyrq, String yq, String ybh) {
-        labPatwarningMapper.deleteLabPatwarning(jyrq, yq, ybh);
-    }
-    @Transactional(rollbackFor = Exception.class)
-    public void deleteLabResultwarning(Date jyrq, String yq, String ybh) {
-        labResultwarningMapper.deleteLabResultwarning(jyrq, yq, ybh);
-    }
-
 
     //=====项目字典查询=========
     public List<XmInfo> getXmInfoList(String yq) {
@@ -233,16 +203,10 @@ public class CommonUtil {
     public List<XmCalc> getXmCalcList(String yq) {
         return xmCalcMapper.getXmCalcList(yq);
     }
-
-    @Transactional(rollbackFor = Exception.class)
     public Integer insertComLog(ComLog comLog) {
         return comLogMapper.insertComLog(comLog);
     }
 
-    @Transactional(rollbackFor = Exception.class)
-    public Integer insertLisPatlog(LisPatlog lisPatlog) {
-        return lisPatlogMapper.insertLisPatlog(lisPatlog);
-    }
 
     public String getYqmc(String yq) {
         return labInstrMapper.getYqmc(yq);
@@ -419,8 +383,4 @@ public class CommonUtil {
     public LabReqreportPdffile getLabReqreportPdffileOne(Date jyrq, String yq, String ybh) {
         return labReqreportPdffileMapper.getLabReqreportPdffileOne(jyrq, yq, ybh);
     }
-    @Transactional(rollbackFor = Exception.class)
-    public int deleteLabReqreportPdffile(Date jyrq, String yq, String ybh) {
-        return labReqreportPdffileMapper.deleteLabReqreportPdffile(jyrq, yq, ybh);
-    }
 }

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisUtil.java

@@ -1,13 +1,8 @@
 package com.czlis.interfaceCommon.utils;
 
-import com.czlis.common.utils.DateUtils;
-
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Map;
@@ -245,30 +240,4 @@ public class LisUtil {
         // 3. 返回推算的时间
         return calendar.getTime();
     }
-
-    /**
-     * 判断前一个时间与后面时间间隔几分钟
-     * @param pastDate
-     * @param datenow
-     * @return
-     */
-    public static long relativeMinute(Date pastDate,Date datenow) {
-        LocalDateTime pastTime = pastDate.toInstant()
-                .atZone(ZoneId.systemDefault())
-                .toLocalDateTime();
-        LocalDateTime now = datenow.toInstant()
-                .atZone(ZoneId.systemDefault())
-                .toLocalDateTime();
-        long minutesDiff = Duration.between(pastTime, now).toMinutes();
-        return minutesDiff;
-    }
-
-    /**
-     * 判断一个时间与当前时间间隔几分钟
-     * @param pastDate
-     * @return
-     */
-    public static long relativeMinute(Date pastDate) {
-        return relativeMinute(pastDate,new Date());
-    }
 }

lis-interfaceCommon/src/main/resources/mapper/LabPatwarningMapper.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.czlis.interfaceCommon.mapper.LabPatwarningMapper">
-    <select id="getLabPatwarning"  resultMap="com.czlis.common.core.domain.entity.lis.LabPatwarning">
-        select *
-        from lab_patwarning
-        where jyrq = #{jyrq,jdbcType=TIMESTAMP}
-        and yq = #{yq,jdbcType=CHAR}
-        and ybh = #{ybh,jdbcType=VARCHAR}
-    </select>
-
-    <delete id="deleteLabPatwarning">
-        delete from lab_patwarning
-        where jyrq = #{jyrq}
-          and yq = #{yq}
-          and ybh = #{ybh}
-    </delete>
-    <insert id="insertLabPatwarning" parameterType="com.czlis.common.core.domain.entity.lis.LabPatwarning">
-        insert into lab_patwarning (jyrq, yq, ybh,
-                                    lb, bgr, btzr, tzfs,
-                                    tzsj, bz, qrr, qrsj,
-                                    qrr1, qrsj1, zt, tbr,
-                                    tbsj, fhzt, fhyy, fhr,
-                                    fhsj, jtr, lrr, lrsj,
-                                    phone)
-        values (#{jyrq,jdbcType=TIMESTAMP}, #{yq,jdbcType=CHAR}, #{ybh,jdbcType=VARCHAR},
-                #{lb,jdbcType=CHAR}, #{bgr,jdbcType=VARCHAR}, #{btzr,jdbcType=VARCHAR}, #{tzfs,jdbcType=VARCHAR},
-                #{tzsj,jdbcType=TIMESTAMP}, #{bz,jdbcType=VARCHAR}, #{qrr,jdbcType=VARCHAR}, #{qrsj,jdbcType=TIMESTAMP},
-                #{qrr1,jdbcType=CHAR}, #{qrsj1,jdbcType=TIMESTAMP}, #{zt,jdbcType=CHAR}, #{tbr,jdbcType=VARCHAR},
-                #{tbsj,jdbcType=TIMESTAMP}, #{fhzt,jdbcType=CHAR}, #{fhyy,jdbcType=VARCHAR}, #{fhr,jdbcType=VARCHAR},
-                #{fhsj,jdbcType=TIMESTAMP}, #{jtr,jdbcType=VARCHAR}, #{lrr,jdbcType=VARCHAR}, #{lrsj,jdbcType=TIMESTAMP},
-                #{phone,jdbcType=VARCHAR})
-    </insert>
-</mapper>

lis-interfaceCommon/src/main/resources/mapper/LabReqreportPdffileMapper.xml

@@ -10,10 +10,5 @@
     <select id="getLabReqreportPdffileOne" resultType="com.czlis.common.core.domain.entity.lis.LabReqreportPdffile">
         select * from lab_reqreport_pdffile where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh}
     </select>
-    <delete id="deleteLabReqreportPdffile">
+
-        delete from lab_reqreport_pdffile
-        where jyrq = #{jyrq}
-          and yq = #{yq}
-          and ybh = #{ybh}
-    </delete>
 </mapper>

lis-interfaceCommon/src/main/resources/mapper/LabResultwarningMapper.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.czlis.interfaceCommon.mapper.LabResultwarningMapper">
-    <select id="getLabResultwarning"  resultMap="com.czlis.common.core.domain.entity.lis.LabResultwarning">
-        select *
-        from lab_resultwarning
-        where jyrq = #{jyrq,jdbcType=TIMESTAMP}
-          and yq = #{yq,jdbcType=CHAR}
-          and ybh = #{ybh,jdbcType=VARCHAR}
-    </select>
-    <delete id="deleteLabPatwarning">
-        delete from lab_resultwarning
-        where jyrq = #{jyrq}
-          and yq = #{yq}
-          and ybh = #{ybh}
-    </delete>
-    <insert id="insertLabResultwarning" parameterType="com.czlis.common.core.domain.entity.lis.LabResultwarning">
-        insert into lab_resultwarning (jyrq, yq, ybh,
-                                       xmdh, csjg, jgbz, bz
-        )
-        values (#{jyrq,jdbcType=TIMESTAMP}, #{yq,jdbcType=CHAR}, #{ybh,jdbcType=VARCHAR},
-                #{xmdh,jdbcType=VARCHAR}, #{csjg,jdbcType=VARCHAR}, #{jgbz,jdbcType=CHAR}, #{bz,jdbcType=VARCHAR}
-               )
-    </insert>
-</mapper>

lis-interfaceCommon/src/main/resources/mapper/LisPatlogMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.czlis.interfaceCommon.mapper.LisPatlogMapper">
-
-    <select id="getLisPatlogList" resultType="com.czlis.common.core.domain.entity.lis.LisPatlog">
-        select * from lis_patlog where  yq = #{yq} and jyrq = #{jyrq} and ybh = #{ybh}
-    </select>
-    <select id="getLisPatlog" resultType="com.czlis.common.core.domain.entity.lis.LisPatlog">
-        select * from lis_patlog where   yq = #{yq} and jyrq = #{jyrq} and ybh = #{ybh}  and xgrq = #{xgrq}
-    </select>
-    <insert id="insertLisPatlog" parameterType="com.czlis.common.core.domain.entity.lis.LisPatlog">
-        insert into lis_patlog (jyrq,   yq,   ybh,   xgrq,   xgyhdh, bz1)
-        values (#{jyrq}, #{yq}, #{ybh},#{xgrq}, #{xgyhdh},#{bz1})
-    </insert>
-
-
-</mapper>

liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java

@@ -56,17 +56,4 @@ public class LisWorkOperController extends BaseController {
 
         return lisWorkOperService.confirm(jyrq,  yq,  ybh, hdys);
     }
-    @ApiOperation("取消审核")
-    @GetMapping("/uncheck2")
-    public Result uncheck2( Date jyrq, String yq, String ybh, String hdys){
-        log.info("yq:{}", yq);
-        hdys="lis";
-
-        return lisWorkOperService.unconfirm(jyrq,  yq,  ybh, hdys);
-    }
-    @GetMapping("/unconfirmlog")
-    public Result unconfirmlog( Date jyrq, String yq, String ybh, String hdys,String reason){
-        return lisWorkOperService.unconfirmlog(jyrq,  yq,  ybh, hdys,reason);
-    }
-
 }

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

@@ -34,17 +34,6 @@ public interface LisWorkOperService {
      * @return
      */
     Result confirm(Date jyrq, String yq, String ybh, String hdys);
-
-    /**
-     * 解除审核
-     * @param jyrq
-     * @param yq
-     * @param ybh
-     * @param hdys
-     * @return
-     */
-    Result unconfirm(Date jyrq, String yq, String ybh, String hdys);
-    Result unconfirmlog(Date jyrq, String yq, String ybh, String hdys,String reason);
     /**
      * 计算项目参考值结果异常标志
      *

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

@@ -213,7 +213,6 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
      * @param hdys
      * @return
      */
-    @Override
     public Result confirm(Date jyrq, String yq, String ybh, String hdys) {
         if (hdys == null || "".equals(hdys)) new Result("-1", "审核者为空，无法审核！");
         //入参通过GET推送时使用ServletUtils.getParameterToInt获取
@@ -273,12 +272,19 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
     /**
      * 审核前校验数据完整性,审核业务和初审业务都可使用
      *
-     * @param labPat
+     * @param jyrq
-     * @param labResultList
+     * @param yq
-     * @param checktype
+     * @param ybh
-     * @param problemId
      * @return
      */
+    public Result beforeconfirm(Date jyrq, String yq, String ybh) {
+        int problemId = ServletUtils.getParameterToInt("problemId", 0);
+        LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh);
+        List<LabResult> labResultList = commonUtil.getLabResultList(jyrq, yq, ybh);
+        return beforeconfirm(labPat, labResultList,2, problemId);
+    }
+
+    //内部使用
     private Result beforeconfirm(LabPat labPat,List<LabResult> labResultList, Integer checktype, Integer problemId) {
         Date jyrq = labPat.getJyrq();
         String yq = labPat.getYq();
@@ -423,7 +429,6 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
 
     /**
      * 医学审核条件判断
-     *
      * @param labPat
      * @param problemId
      * @return
@@ -438,10 +443,8 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
         }
         return new Result("0", "保存成功！");
     }
-
     /**
      * 高级医学审核条件判断
-     *
      * @param labPat
      * @param problemId
      * @return
@@ -476,14 +479,21 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
         }
         return new Result("0", "保存成功！");
     }
-
     /**
      * 审核后步骤,在审核过程中,必须完成审核前校验通过,结果计算值填充,参考值结果标志危急值标志填写完成,最后使用此方法修改状态
      *
-     * @param labPat
+     * @param jyrq
-     * @param problemId
+     * @param yq
+     * @param ybh
      * @return
      */
+    public Result afterconfirm(Date jyrq, String yq, String ybh) {
+        int problemId = ServletUtils.getParameterToInt("problemId", 0);
+        LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh);
+        return afterconfirm(labPat, problemId);
+    }
+
+    //内部使用
     private Result afterconfirm(LabPat labPat, Integer problemId) {
         Date jyrq = labPat.getJyrq();
         String yq = labPat.getYq();
@@ -750,7 +760,6 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
         calcsample(labPat,labResultList);
         return new Result("0", "保存成功！");
     }
-
     private List<LabResult> calcsample(LabPat labPat,List<LabResult> labResultList) {
         Date jyrq = labPat.getJyrq();
         String yq = labPat.getYq();
@@ -834,7 +843,6 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
         }
         return labResultList;
     }
-
     /**
      * 计算项目参考值结果异常标志
      *
@@ -903,9 +911,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
             log.info("labResultList.size:{}",labResultList.size());
             List<XmInfo> xmInfoList= commonUtil.getXmInfoList(yq);
             List<XmAlarmdetail> xmAlarmdetailList=null;
-            if (!nowjz) {
+            if(!nowjz){xmAlarmdetailList =commonUtil.getXmAlarmdetailList(yq);}
-                xmAlarmdetailList = commonUtil.getXmAlarmdetailList(yq);
-            }
             for (LabResult labResult : labResultList) {
                 String csjg = labResult.getCsjg();
                 boolean lb_nummode = LisUtil.isTureNumber(csjg);
@@ -1262,7 +1268,6 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
 
     /**
      * 查询明细是否有危急值标识
-     *
      * @param labResultList
      * @return
      */
@@ -1274,134 +1279,4 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
         }
         return wjz;
     }
-
-    /**
-     * 解除审核原因登记
-     *
-     * @param jyrq
-     * @param yq
-     * @param ybh
-     * @param hdys
-     * @return
-     */
-    @Override
-    public Result unconfirmlog(Date jyrq, String yq, String ybh, String hdys, String reason) {
-        if ("".equals(reason)) {
-            return new Result("-1", "没写原因,解除失败!");
-        }
-        LisPatlog lisPatlog = new LisPatlog();
-        lisPatlog.setYq(yq);
-        lisPatlog.setYbh(ybh);
-        lisPatlog.setXgyhdh(hdys);
-        lisPatlog.setJyrq(jyrq);
-        lisPatlog.setXgrq(new Date());
-        lisPatlog.setBz1(reason);
-        commonUtil.insertLisPatlog(lisPatlog);
-        return new Result("0", "写召回原因成功！");
-    }
-
-    /**
-     * 撤销审核报告单全流程
-     *
-     * @param jyrq
-     * @param yq
-     * @param ybh
-     * @param yhdh
-     * @return
-     */
-    @Override
-    public Result unconfirm(Date jyrq, String yq, String ybh, String yhdh) {
-        if (yhdh == null || "".equals(yhdh)) new Result("-1", "操作者为空，无法解除审核！");
-        //入参通过GET推送时使用ServletUtils.getParameterToInt获取
-        //入参通过POSTJSON时使用JsonParamUtils.getParameterToInt获取
-        int problemId = ServletUtils.getParameterToInt("problemId", 0);
-        LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh);
-        List<LabResult> labResultList = commonUtil.getLabResultList(jyrq, yq, ybh);
-        if (problemId < 3) {
-            //1,解除审核权限校验
-            if (!commonUtil.getUserPower(yq, yhdh, 10)) return new Result("-1", "当前操作者无权对本仪器报告解除审核！");
-            //2:数据合法性校验
-            String jgbz = labPat.getJgbz();
-            if (!"2".equals(jgbz)) return new Result("1", "报告未审核,不需解除！");
-        }
-        if (problemId < 3) problemId = 3;
-        if (problemId < 4) {
-            String unconfirmlog = commonUtil.getComOptValue(yq, "unconfirmlog");
-            if ("1".equals(unconfirmlog)) {
-                return new Result("4", "请填写解除审核原因！", 4);
-            }
-        }
-        if (problemId < 4) problemId = 4;
-        //调用his报告接口，完成报告同时调用外部接口任务
-        if (problemId < 5) {
-            SetReport setReport = new SetReport();
-            setReport.setIp(IpUtils.getIpAddr());
-            setReport.setJyrq(DateFormatUtils.format(jyrq, "yyyy-MM-dd"));
-            setReport.setYq(yq.trim());
-            setReport.setYbh(ybh);
-            setReport.setUserid(yhdh);
-            setReport.setStatus(LisinterfaceNameConstants.REPORTCANCAL);
-            Result result = lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.SETREPORT, setReport);
-            if (result.getCode().equals("5")) {
-                if (problemId < 5) {
-                    return new Result(result.getCode(), result.getMsg(), 5);
-                }
-            }
-            if (!result.getCode().equals("0")) return result;
-        }
-        if (problemId < 5) problemId = 5;
-        String sqh = labPat.getSqh();
-        LabReqmain labReqmain = commonUtil.getLabReqmainOne(sqh);
-        if (labReqmain != null) {
-            String zt = labReqmain.getZt();
-            if (!SampleStatusConstants.CANCAL.equals(zt)) {
-                labReqmain.setConfirmer("");
-                labReqmain.setConfirmtime(null);
-                if (SampleStatusConstants.CONFIRM.equals(zt)) {
-                    labReqmain.setZt(SampleStatusConstants.SIGNFOR);
-                    labReqmain.setConfirmer("");
-                    labReqmain.setConfirmtime(null);
-                    commonUtil.updateLabReqmain(labReqmain);
-                }
-            }
-        }
-        String msg = "取消成功!";
-        String sp_rebackreport = commonUtil.getHISOPT("sp_rebackreport");
-        if ("1".equals(sp_rebackreport)) {
-            if ("1".equals(labPat.getDybz())) {
-                msg = msg + LisUtil.LINE_SEPARATOR + "此报告为已打印报告，注意考虑是否追回";
-            }
-            LabPatwarning labPatwarning = commonUtil.getLabPatwarning(jyrq, yq, ybh);
-            if (labPatwarning != null) {
-                if (problemId < 6) {
-                    Date tzsj = labPatwarning.getTzsj();
-                    long sjc = LisUtil.relativeMinute(tzsj);
-                    if (sjc > 10) {
-                        return new Result("4", "此报告已发布危急值结果，并且时间超过10分钟了!", 6);
-                    }
-                }
-                //权限不足，撤回报告失败组长权限单独接口校验,略.................
-
-                commonUtil.deleteLabPatwarning(jyrq, yq, ybh);
-                commonUtil.deleteLabResultwarning(jyrq, yq, ybh);
-            }
-        }
-        commonUtil.deleteLabReqreportPdffile(jyrq, yq, ybh);
-        labPat.setFslx("");
-        labPat.setJgbz(ReportStatusConstants.DEFAULT);
-        commonUtil.updateLabPat(labPat);
-        setComLog(jyrq, yq, ybh,yhdh,"UCK","");
-        return new Result("3", msg);
-    }
-    public void setComLog(Date jyrq, String yq, String ybh, String yhdh,String logtype,String logdata){
-        ComLog comLog = new ComLog();
-        comLog.setJyrq(jyrq);
-        comLog.setYq(yq);
-        comLog.setYbh(ybh);
-        comLog.setYhdh(yhdh);
-        comLog.setDnmc(IpUtils.getIpAddr());
-        comLog.setRzbz(logtype);
-        comLog.setRznr(logdata);
-        commonUtil.insertComLog(comLog);
-    }
 }