jiangs/lis8.0
2
0
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jiangs 2026-02-06 14:09:39 +08:00
commit eecd3519a4
4 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
liswork/src/main/java/com/czlis/liswork/pojo/DTO/QcValDTO.java
View File

@ -2,10 +2,15 @@ package com.czlis.liswork.pojo.DTO;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.util.Date;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class QcValDTO {
private Long qc_valid;
@ApiModelProperty(value = "仪器")

3
liswork/src/main/java/com/czlis/liswork/pojo/WholeProcessVO.java
View File

@ -138,6 +138,9 @@ public class WholeProcessVO {
private String brlyname;
private String cyrname;
private String ztname;
private String yblxname;
private String yqname;
private String confirmername;
@ApiModelProperty(value = "申请时间起始")
private Date sqsj1;
@ApiModelProperty(value = "申请时间截止")

25
liswork/src/main/resources/mapper/QcGraphMapper.xml
View File

@ -11,8 +11,7 @@
<if test="zkpph != null and zkpph !=''">and zkpph = #{zkpph}</if>
<if test="yq != null and yq !=''">and yq = #{yq}</if>
<if test="yq != null and yq !=''">and yq = #{yq}</if>
<if test="zkrq1 != null">and ksrq >=(select max(ksrq) from qc_sample x where x.yq=qc_sample.yq and x.xmdh=qc_sample.xmdh and x.zkph=qc_sample.zkph and #{zkrq1}>=x.ksrq)</if>
<if test="zkrq2 != null">and #{zkrq2}>= ksrq </if>
<if test="zkrq1 != null">and ksrq =(select max(ksrq) from qc_sample x where x.yq=qc_sample.yq and x.xmdh=qc_sample.xmdh and x.zkph=qc_sample.zkph and #{zkrq1}>=x.ksrq)</if>
</where>
and xmdh not in('_pj_','_skxj_') and (zkph not like '%bz' )
order by yq,xmdh,ksrq,zkph
@ -30,8 +29,8 @@
<if test="xmdh != null and xmdh !=''">and qc_val.xmdh = #{xmdh}</if>
<if test="zkph != null and zkph !=''">and qc_val.zkph = #{zkph}</if>
<if test="zkpph != null and zkpph !=''">and qc_sample.zkpph = #{zkpph}</if>
<if test="zkrq1 != null">and qc_val.ksrq>= #{zkrq1} </if>
<if test="zkrq2 != null">and #{zkrq2}>= qc_val.ksrq </if>
<if test="zkrq1 != null">and qc_val.zkrq>= #{zkrq1} </if>
<if test="zkrq2 != null">and #{zkrq2}>= qc_val.zkrq </if>
<if test="cs != null and cs !=10">and qc_val.cs = #{cs}</if>
</where>
order by qc_val.zkrq,qc_val.cs
@ -49,8 +48,8 @@
<if test="xmdh != null and xmdh !=''">and qc_val.xmdh = #{xmdh}</if>
<if test="zkph != null and zkph !=''">and qc_val.zkph = #{zkph}</if>
<if test="zkpph != null and zkpph !=''">and qc_sample.zkpph = #{zkpph}</if>
<if test="zkrq1 != null">and qc_val.ksrq>= #{zkrq1} </if>
<if test="zkrq2 != null">and #{zkrq2}>= qc_val.ksrq </if>
<if test="zkrq1 != null">and qc_val.zkrq>= #{zkrq1} </if>
<if test="zkrq2 != null">and #{zkrq2}>= qc_val.zkrq </if>
<if test="cs != null and cs !=10">and qc_val.cs =(select max(cs) from qc_val a where a.yq=qc_val.yq and a.xmdh=qc_val.xmdh and a.zkph=qc_val.zkph and a.zkrq=qc_val.zkrq) </if>
</where>
order by qc_val.zkrq,qc_val.cs
@ -68,8 +67,8 @@
<if test="xmdh != null and xmdh !=''">and qc_val.xmdh = #{xmdh}</if>
<if test="zkph != null and zkph !=''">and qc_val.zkph = #{zkph}</if>
<if test="zkpph != null and zkpph !=''">and qc_sample.zkpph = #{zkpph}</if>
<if test="zkrq1 != null">and qc_val.ksrq>= #{zkrq1} </if>
<if test="zkrq2 != null">and #{zkrq2}>= qc_val.ksrq </if>
<if test="zkrq1 != null">and qc_val.zkrq>= #{zkrq1} </if>
<if test="zkrq2 != null">and #{zkrq2}>= qc_val.zkrq </if>
<if test="cs != null and cs !=10">and abs(qc_sample.zkbz - qc_val.zkjg)=(select min(abs(qc_sample.zkbz - a.zkjg)) from qc_val a where a.yq=qc_val.yq and a.xmdh=qc_val.xmdh and a.zkph=qc_val.zkph and a.zkrq=qc_val.zkrq) </if>
</where>
order by qc_val.zkrq,qc_val.cs
@ -90,8 +89,8 @@
<if test="xmdh != null and xmdh !=''">and qc_val.xmdh = #{xmdh}</if>
<if test="zkph != null and zkph !=''">and qc_val.zkph = #{zkph}</if>
<if test="zkpph != null and zkpph !=''">and qc_sample.zkpph = #{zkpph}</if>
<if test="zkrq1 != null">and qc_val.ksrq>= #{zkrq1} </if>
<if test="zkrq2 != null">and #{zkrq2}>= qc_val.ksrq </if>
<if test="zkrq1 != null">and qc_val.zkrq>= #{zkrq1} </if>
<if test="zkrq2 != null">and #{zkrq2}>= qc_val.zkrq </if>
<if test="cs != null and cs !=10">and qc_val.cs =1</if>
</where>
order by qc_val.zkrq,qc_val.cs
@ -117,10 +116,8 @@
<if test="yq != null and yq !=''">and qc_val.yq = #{yq}</if>
<if test="xmdh != null and xmdh !=''">and qc_val.xmdh = #{xmdh}</if>
<if test="zkph != null and zkph !=''">and qc_val.zkph = #{zkph}</if>
<if test="zkpph != null and zkpph !=''">and qc_sample.zkpph = #{zkpph}</if>
<if test="zkrq1 != null">and qc_val.ksrq>= #{zkrq1} </if>
<if test="zkrq2 != null">and #{zkrq2}>= qc_val.ksrq </if>
<if test="cs != null and cs !=10">and qc_val.cs = #{cs}</if>
<if test="zkrq1 != null">and qc_val.zkrq>= #{zkrq1} </if>
<if test="zkrq2 != null">and #{zkrq2}>= qc_val.zkrq </if>
</where>
group by qc_val.yq,qc_val.zkph,qc_val.xmdh,xm_info.xmmc,xm_info.dyxh,qc_sample.zkbz,qc_sample.sd,qc_sample.cv
order by xm_info.dyxh,qc_val.zkph

4
liswork/src/main/resources/mapper/WholeProcessMapper.xml
View File

@ -9,13 +9,15 @@
(case rtrim(a.brxb) when '1' then '男' when '2' then '女' else '' end) as brxbname,
isnull((select zdmc from com_dict where zdlb = 'SRD' AND zddh = a.sqys),a.sqys) as sqysname,
isnull((select zdmc from com_dict where zdlb = 'SRD' AND zddh = a.bbsjr),a.bbsjr) as bbsjrname,
isnull((select zdmc from com_dict where zdlb = 'SRD' AND zddh = a.zxys),a.zxys) as zxysname,
isnull((select zdmc from com_dict where zdlb = 'SRD' AND zddh = a.zxys),isnull((select yhxm from com_usr where yhdh = a.zxys),a.zxys)) as zxysname,
isnull((select yhxm from com_usr where yhdh = a.jsys),a.jsys) as jsysname,
isnull((select zdmc from com_dict where zdlb = 'DP' AND zddh = a.ksdh),a.ksdh) as ksname,
isnull((select zdmc from com_dict where zdlb = 'PT' AND zddh = a.brly),a.brly) as brlyname,
isnull((select zdmc from com_dict where zdlb = 'SRD' AND zddh = a.cyr),a.cyr) as cyrname,
isnull((select zdmc from com_dict where zdlb = 'HOS' AND zddh = a.yljg),a.yljg) as yljgname,
isnull((select zdmc from com_dict where zdlb = 'BT' AND zddh = a.yblx),a.yblx) as yblxname,
isnull((select yqmc from lab_instr where yq = a.yqdh),a.yqdh) as yqname,
isnull((select yhxm from com_usr where yhdh = a.confirmer),a.confirmer) as confirmername,
(case when a.zt='2' and isnull(a.yqdh,'')!='' then '检验中' else isnull((select dict_label from sys_dict_data where dict_type='lis_req_type' and dict_value=a.zt),a.zt) end ) as ztname,
datediff(minute,a.cysj,a.jssj) as cp_cytojs,
datediff(minute,a.jssj,a.confirmtime) as cp_jstobg,