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 2025-10-27 18:16:40 +08:00
commit f053d9f9cc
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputmdlDetail.java
View File

@ -13,4 +13,5 @@ public class LabInputmdlDetail {
private Integer xh; private Integer xh;
private String xmdh; private String xmdh;
private String mrz; private String mrz;
private String xmmc;
} }

4
lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java
View File

@ -140,7 +140,7 @@ public class LisWorkUtils {
} }
//commonUtil.delLabResultAll(jyrq0,yq0,ybh0); //commonUtil.delLabResultAll(jyrq0,yq0,ybh0);
for (LabResult labResult : labResultList) { for (LabResult labResult : labResultList) {
if(labResult.getChangeflag()==2) { if(labResult.getChangeflag() != null && labResult.getChangeflag()==2) {
commonUtil.delLabResult(labResult); commonUtil.delLabResult(labResult);
commonUtil.insertLabResult(labResult); commonUtil.insertLabResult(labResult);
labResult.setChangeflag(0); labResult.setChangeflag(0);
@ -173,6 +173,7 @@ public class LisWorkUtils {
String yqdl = commonUtil.getYqdl(yq); String yqdl = commonUtil.getYqdl(yq);
//查询病人信息 //查询病人信息
LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh); LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh);
if(labPat==null) return new Result("0", "保存成功！");
String finish = labPat.getFinish(); String finish = labPat.getFinish();
if (!"细菌仪".equals(yqdl) && finish != null && finsh == 1) labPat.setFinish("1"); if (!"细菌仪".equals(yqdl) && finish != null && finsh == 1) labPat.setFinish("1");
labResultList = saveallresult(labPat, labResultList); labResultList = saveallresult(labPat, labResultList);
@ -2132,6 +2133,7 @@ public class LisWorkUtils {
labResult.setYbh(ybh); labResult.setYbh(ybh);
labResult.setXmdh(labInputmdlDetail.getXmdh()); labResult.setXmdh(labInputmdlDetail.getXmdh());
labResult.setCsjg(labInputmdlDetail.getMrz()); labResult.setCsjg(labInputmdlDetail.getMrz());
labResult.setXmmc(labInputmdlDetail.getXmmc());
if(!savefalg)labResult.setChangeflag(2); if(!savefalg)labResult.setChangeflag(2);
else { else {
labResult.setChangeflag(1); labResult.setChangeflag(1);

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

@ -3,6 +3,10 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" > "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.czlis.interfaceCommon.mapper.LabInputmdlDetailMapper"> <mapper namespace="com.czlis.interfaceCommon.mapper.LabInputmdlDetailMapper">
<select id="getLabInputmdlDetail" resultType="com.czlis.common.core.domain.entity.lis.LabInputmdlDetail"> <select id="getLabInputmdlDetail" resultType="com.czlis.common.core.domain.entity.lis.LabInputmdlDetail">
SELECT lab_inputmdldetail.*,xm_info.xmmc FROM lab_inputmdldetail join xm_info on xm_info.yq=lab_inputmdldetail.yq
and xm_info.xmdh=lab_inputmdldetail.xmdh where lab_inputmdldetail.yq = #{yq} and lab_inputmdldetail.mbmc=#{mbmc} order by xh asc
</select>
<select id="getLabInputmdlDetailAll" resultType="com.czlis.common.core.domain.entity.lis.LabInputmdlDetail">
SELECT * FROM lab_inputmdldetail where yq = #{yq} and mbmc=#{mbmc} order by xh asc SELECT * FROM lab_inputmdldetail where yq = #{yq} and mbmc=#{mbmc} order by xh asc
</select> </select>
</mapper> </mapper>

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

@ -243,7 +243,7 @@ public class LisWorkServiceImpl implements LisWorkService {
labInputcol3.setKj("1"); labInputcol3.setKj("1");
labInputcol3.setKybj("0"); labInputcol3.setKybj("0");
labInputcol3.setZdts("名称"); labInputcol3.setZdts("名称");
labInputcol3.setMrz("120"); labInputcol3.setMrz("100");
ResultConfig.add(3,labInputcol3); ResultConfig.add(3,labInputcol3);
LabInputcol labInputcol4 =new LabInputcol(); LabInputcol labInputcol4 =new LabInputcol();
labInputcol4.setXh(4); labInputcol4.setXh(4);