Merge remote-tracking branch 'origin/master'

This commit is contained in:
tangw 2026-01-26 17:41:24 +08:00
commit b72bc57fc0
3 changed files with 5 additions and 5 deletions

View File

@ -136,9 +136,9 @@ public class LisInterfaceUtil {
String retMsg = String.valueOf(map.get("retmsg"));
log.info("调用存储过程{}返回值:{},{}",type,retCode,retMsg);
if(retCode.equals("0")){
return new Result("0","调用接口成功!",retMsg);
return new Result("0","调用接口成功!"+retMsg);
}else{
return new Result(retCode,"调用接口失败!",retMsg);
return new Result(retCode,"调用接口失败!"+retMsg);
}
}

View File

@ -73,6 +73,7 @@ public class Web_getBarcode {
private Date st;
private Date et;
private String jymd;
private Date sjsj;
private String queryType;
private String queryValue;

View File

@ -11,9 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
(select zdmc from com_dict where zdlb = 'SRD' AND zddh = a.bbsjr) as bbsjrname,
(select yhxm from com_usr where yhdh = a.zxys) as zxysname,
(select yhxm from com_usr where yhdh = a.jsys) as jsysname,
(select zdmc from com_dict where zdlb = 'DP' AND zddh = a.ksdh) as ksname,
c.confirmdt as confirmdt
from lab_reqmain a left join lab_feeitemclass b on (a.bgddh = b.sflbdh) left join lab_pat c on (a.sqh = c.sqh)
(select zdmc from com_dict where zdlb = 'DP' AND zddh = a.ksdh) as ksname
from lab_reqmain a left join lab_feeitemclass b on (a.bgddh = b.sflbdh)
</sql>
<select id="getSQDInfo" parameterType="com.czlis.zycx.pojo.Web_getBarcode" resultType="com.czlis.zycx.pojo.Web_getBarcode">