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 17:56:30 +08:00
parent 08ac90618f
commit f633442e3a
3 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java
View File

@ -58,6 +58,11 @@ public class LisWorkOperController extends BaseController {
public Result changeresult(@RequestBody LabResult labResult){
return lisWorkOperService.changeresult(labResult);
}
@ApiOperation("修改病人结果")
@PostMapping("/newresult")
public Result newresult(@RequestBody LabResult labResult){
return lisWorkOperService.newresult(labResult);
}
/**
* 审核报告

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

@ -12,6 +12,7 @@ public interface LisWorkOperService {
Result changePat(LabPat labPat);
Result changePatColumn(Date jyrq, String yq, String ybh,String column,String value);
Result changeresult(LabResult labResult);
Result newresult(LabResult labResult);
/**
* 保存所有结果的修正值,涉及:空结果清除,计算项目添加,添加单位,添加申请项目编码,参考值重新计算更新,结果标志重新计算更新,危急值标志计算更新
*

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

@ -56,8 +56,6 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
LabReqdetailMapper labReqdetailMapper;
@Autowired
CheckResultUtils checkResultUtils;
@Autowired
private LisWorkUtil lisWorkUtil;
@Override
public Result newPatInfo(Date jyrq, String ybh, String sqh, String yq, Long userId) {
@ -168,7 +166,36 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
setComLog(jyrq, yq, ybh,SecurityUtils.getLoginUser().getUsername(),ComLogConstants.LG_M,column+":"+value);
return new Result("0", "保存成功");
}
@Override
public Result newresult(LabResult labResult){
String yq=labResult.getYq();
Date jyrq=labResult.getJyrq();
String ybh=labResult.getYbh();
String xmdh=labResult.getXmdh();
if("".equals(xmdh)||xmdh==null) return new Result("-1", "项目代号不能为空!");
LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh);
if("2".equals(labPat.getJgbz())) return new Result("-1", "结果已审核禁止修改!");
if("5".equals(labPat.getJgbz())) return new Result("-1", "结果已锁定禁止修改!");
if("1".equals(labPat.getJgbz())) return new Result("-1", "结果已初审禁止修改!");
boolean nowjz=checknowjz(labPat);
XmInfo xmInfo=commonUtil.getXmInfo(yq,xmdh);
List<XmAlarmdetail> getXmAlarmdetail=commonUtil.getXmAlarmdetail(yq,xmdh);
labResult=setxmdhrefs(labPat,labResult,xmInfo, getXmAlarmdetail,nowjz);
commonUtil.insertLabResult(labResult);
List<XmCalc> xmCalcList = commonUtil.getXmCalcbyxmdh(yq,xmdh);
if(xmCalcList.size()>0) {
List<LabResult> labResultList = commonUtil.getLabResultList(jyrq, yq, ybh);
labResultList = calcsample(labPat, labResultList,xmCalcList);
List<LabResult> labResultList1=labResultList.stream().filter(labR -> labR.getChangeflag() != null).filter(labR-> labR.getChangeflag()==1).collect(Collectors.toList());
if(labResultList1.size()>0) {
for(LabResult labResult0:labResultList1) {
changeresultf(labPat, labResult0, nowjz);
}
}
}
return new Result("0", "保存成功");
}
/**
* 修改结果
* @param labResult
@ -208,7 +235,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
if(xmCalcList.size()>0) {
List<LabResult> labResultList = commonUtil.getLabResultList(jyrq, yq, ybh);
labResultList = calcsample(labPat, labResultList,xmCalcList);
List<LabResult> labResultList1=labResultList.stream().filter(labR-> labR.getChangeflag()==1).collect(Collectors.toList());
List<LabResult> labResultList1=labResultList.stream().filter(labR -> labR.getChangeflag() != null).filter(labR-> labR.getChangeflag()==1).collect(Collectors.toList());
if(labResultList1.size()>0) {
for(LabResult labResult0:labResultList1) {
changeresultf(labPat, labResult0, nowjz);
@ -313,14 +340,14 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
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:
}
}
// if(!"!".equals(labInputcol)){
// String zdmc=labInputcol.getZdmc();
// switch(zdmc){
// case "":
// break;
// default:
// }
// }
}
return new Result("0", "审核成功！",labPat);
}
@ -1315,7 +1342,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
if(resultflag==null)resultflag="";
if(wjzflag==null)wjzflag="";
if(!csjg.equals(labResult.getCsjg())||!dw.equals(labResult.getDw())||!refs.equals(labResult.getRefs())||
!resultflag.equals(labResult.getResult_flag().trim())||!resultflag.equals(labResult.getJgbz().trim())||!wjzflag.equals(labResult.getAlarm_flag().trim())) {
!resultflag.equals(labResult.getResult_flag())||!resultflag.equals(labResult.getJgbz())||!wjzflag.equals(labResult.getAlarm_flag())) {
labResult.setCsjg(csjg);
labResult.setDw(dw);
labResult.setRefs(refs);
@ -1670,7 +1697,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
setlabReqsteplog(sqh,SampleStatusConstants.START,yhdh);
}
if (!"取消成功!".equals(msg)) return new Result("3", msg);
return new Result("1", msg);
return new Result("0", msg);
}
@Override
public Result unconfirm1(Date jyrq, String yq, String ybh, String yhdh) {