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-11-05 18:20:56 +08:00
parent f12217ac1b
commit 295ad9342a
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkcom.java
View File

@ -969,23 +969,23 @@ public class LisWorkcom extends LisWorkBase{
if (newpatinfo) commonUtil.insertLabPat(labPat); if (newpatinfo) commonUtil.insertLabPat(labPat);
else commonUtil.updateLabPat(labPat); else commonUtil.updateLabPat(labPat);
commonUtil.insertLabResultByBarcode(jyrq, yq, ybh, sqh); commonUtil.insertLabResultByBarcode(jyrq, yq, ybh, sqh);
List<LabResult> labResultList=commonUtil.getLabResultList(jyrq, yq, ybh); // List<LabResult> labResultList=commonUtil.getLabResultList(jyrq, yq, ybh);
List<LabInputmdl> labInputmdlList=chkautoinput(yq,ybh); // List<LabInputmdl> labInputmdlList=chkautoinput(yq,ybh);
boolean setyblx=false; // boolean setyblx=false;
if(!labInputmdlList.isEmpty()) { // if(!labInputmdlList.isEmpty()) {
for (LabInputmdl labInputmdl : labInputmdlList) { // for (LabInputmdl labInputmdl : labInputmdlList) {
labResultList = batchinput(jyrq, yq, ybh, labResultList, labInputmdl.getMbmc(), true); // labResultList = batchinput(jyrq, yq, ybh, labResultList, labInputmdl.getMbmc(), true);
String yblx = labInputmdl.getYblx(); // String yblx = labInputmdl.getYblx();
if (yblx != null && !yblx.isEmpty()) { // if (yblx != null && !yblx.isEmpty()) {
labPat.setYblx(yblx); // labPat.setYblx(yblx);
setyblx=true; // setyblx=true;
} // }
} // }
if(!labResultList.stream().filter(s->s.getChangeflag()==1).collect(Collectors.toList()).isEmpty()){ // if(!labResultList.stream().filter(s->s.getChangeflag()==1).collect(Collectors.toList()).isEmpty()){
if(setyblx) commonUtil.updateLabPat(labPat); // if(setyblx) commonUtil.updateLabPat(labPat);
} // }
} // }
labResultList=saveallresult(labPat,labResultList); // labResultList=saveallresult(labPat,labResultList);
// Map<String,Object> map=new HashMap<>(); // Map<String,Object> map=new HashMap<>();
// map.put("labpat",labPat); // map.put("labpat",labPat);
// map.put("labresult",labResultList); // map.put("labresult",labResultList);

4
lis-interfaceCommon/src/main/resources/mapper/LabResultMapper.xml
View File

@ -108,9 +108,9 @@
#{bz3,jdbcType=VARCHAR}, #{textresult,jdbcType=LONGVARCHAR}) #{bz3,jdbcType=VARCHAR}, #{textresult,jdbcType=LONGVARCHAR})
</insert> </insert>
<insert id="insertLabResultByBarcode"> <insert id="insertLabResultByBarcode">
insert into lab_result (jyrq, yq, ybh,xmdh,csjg,refs,dw,sqxmdh) insert into lab_result (jyrq, yq, ybh,xmdh,csjg,refs,dw)
select distinct #{jyrq},#{yq},#{ybh},a.xmdh,(case ISNULL(a.mrz,'') when '' then '未做' else a.mrz end), select distinct #{jyrq},#{yq},#{ybh},a.xmdh,(case ISNULL(a.mrz,'') when '' then '未做' else a.mrz end),
b.dyckz,b.dw ,r.sqh from lab_reqdetail r b.dyckz,b.dw from lab_reqdetail r
join xm_reqitem_vs_reportitem a on r.sqxmdh=a.sqxmdh and isnull(def,'') !='1' join xm_reqitem_vs_reportitem a on r.sqxmdh=a.sqxmdh and isnull(def,'') !='1'
join xm_info b on a.yq=b.yq and a.xmdh=b.xmdh join xm_info b on a.yq=b.yq and a.xmdh=b.xmdh
where r.sqh=#{sqh} and a.yq=#{yq} where r.sqh=#{sqh} and a.yq=#{yq}

8
liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java
View File

@ -603,10 +603,10 @@ public class LisWorkServiceImpl implements LisWorkService {
} }
@Override @Override
public Result clearprintflag(Date jyrq, String yq,String ybh){ public Result clearprintflag(Date jyrq, String yq,String ybh){
String jgbz=commonUtil.getLabPatJgbz(jyrq, yq, ybh); // String jgbz=commonUtil.getLabPatJgbz(jyrq, yq, ybh);
if("2".equals(jgbz)){ // if("2".equals(jgbz)){
return new Result("-1", "已审核不允许修改打印标志！"); // return new Result("-1", "已审核不允许修改打印标志！");
} // }
commonUtil.updateLabPatByColumn(jyrq, yq, ybh,"dybz","0"); commonUtil.updateLabPatByColumn(jyrq, yq, ybh,"dybz","0");
return new Result("0", "成功！"); return new Result("0", "成功！");
} }