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

修正查询样本列表

Browse Source
This commit is contained in:
tangw 2025-09-24 15:41:17 +08:00
parent 0564d12086
commit 08ac90618f
6 changed files with 80 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputcol.java Normal file
View File

@ -0,0 +1,24 @@
package com.czlis.common.core.domain.entity.lis;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class LabInputcol {
private String yq;
private String zdmc;
private String zdts;
private String mrts;
private String kybj;
private String zdjy;
private String mrz;
private String kj;
private Integer xh;
}

9
lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabInputcolMapper.java Normal file
View File

@ -0,0 +1,9 @@
package com.czlis.interfaceCommon.mapper;
import com.czlis.common.core.domain.entity.lis.LabInputcol;
import java.util.List;
public interface LabInputcolMapper {
List<LabInputcol> getLabInputcol(String yq);
}

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

@ -71,6 +71,8 @@ public class CommonUtil {
LabResultMedMapper labResultMedMapper;
@Autowired
LabReportvsitemMapper labReportvsitemMapper;
@Autowired
LabInputcolMapper labInputcolMapper;
//====检验主表操作方法集合===
public LabPat getLabPatOne(Date jyrq, String yq, String ybh) {
return labPatMapper.getLabPatOne(jyrq, yq, ybh);
@ -340,7 +342,9 @@ public class CommonUtil {
return zdmc;
}
}
public List<LabInputcol> getLabInputcol(String yq){
return labInputcolMapper.getLabInputcol(yq);
}
//字典查询方法集合
public String getComDictNameById(String zdlb, String zddh) {
List<ComDict> comDictList = getDictCache(zdlb);

10
lis-interfaceCommon/src/main/resources/mapper/LabInputcolMapper.xml Normal file
View File

@ -0,0 +1,10 @@
<?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.LabInputcolMapper">
<select id="getLabInputcol" resultType="com.czlis.common.core.domain.entity.lis.LabInputcol">
SELECT * FROM lab_inputcol where yq = #{yq}
</select>
</mapper>

2
liswork/src/main/java/com/czlis/liswork/service/LisWorkOperService.java
View File

@ -30,7 +30,7 @@ public interface LisWorkOperService {
* @param ybh
*/
void setItemSqxmdh(Date jyrq, String yq, String ybh);
Result loaddefault(Date jyrq, String yq, String ybh);
/**
* 审核报告
*

37
liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java
View File

@ -298,7 +298,32 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
return new Result("0", "保存成功！");
}
/**
* 获取新样本默认值
* @param jyrq
* @param yq
* @param ybh
* @return
*/
@Override
public Result loaddefault(Date jyrq, String yq, String ybh) {
LabPat labPat=new LabPat();
labPat.setSqsj(commonUtil.getCurrentTime());
String yljg=commonUtil.getLabInstr(yq).getYljg();
labPat.setYljg(yljg);
List<LabInputcol> labInputcolList= commonUtil.getLabInputcol(yq);
for (LabInputcol labInputcol : labInputcolList) {
if(!"!".equals(labInputcol)){
String zdmc=labInputcol.getZdmc();
switch(zdmc){
case "":
break;
default:
}
}
}
return new Result("0", "审核成功！",labPat);
}
public void updateLabReqmainZT(String userId, String sqh) {
Map<String, Object> map = new HashMap<>();
map.put("userId", userId);
@ -379,7 +404,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
if(sqh!=null){
setlabReqsteplog(sqh,SampleStatusConstants.CONFIRM,hdys);
}
return new Result("3", "审核成功！");
return new Result("0", "审核成功！");
}
@Override
public Result confirm1(Date jyrq, String yq, String ybh, String hdys) {
@ -442,7 +467,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
// if(sqh!=null){
// setlabReqsteplog(sqh,SampleStatusConstants.CONFIRM,hdys);
// }
return new Result("3", "审核成功！");
return new Result("0", "审核成功！");
}
/**
@ -1557,7 +1582,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
*/
@Override
public Result unconfirm(Date jyrq, String yq, String ybh, String yhdh) {
if (yhdh == null || "".equals(yhdh)) return new Result("-1", "操作者为空，无法解除审核！");
if (yhdh == null || "".equals(yhdh)) return new Result("1", "操作者为空，无法解除审核！");
int problemId = ServletUtils.getParameterToInt("problemId", 0);
LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh);
if (problemId < 3) {
@ -1649,7 +1674,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
}
@Override
public Result unconfirm1(Date jyrq, String yq, String ybh, String yhdh) {
if (yhdh == null || "".equals(yhdh)) return new Result("-1", "操作者为空，无法解除审核！");
if (yhdh == null || "".equals(yhdh)) return new Result("1", "操作者为空，无法解除审核！");
int problemId = ServletUtils.getParameterToInt("problemId", 0);
LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh);
if (problemId < 3) {
@ -1670,7 +1695,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
labPat.setJgbz(ReportStatusConstants.DEFAULT);
commonUtil.updateLabPat(labPat);
setComLog(jyrq, yq, ybh,yhdh, ComLogConstants.LG_UCK1,"");
return new Result("1", "取消成功!");
return new Result("0", "取消成功!");
}
/**