更新医保身份证获取方式,和his缴费字段。
This commit is contained in:
@@ -701,9 +701,18 @@ public class XmlUtil {
|
||||
str.append("<PayNature>");
|
||||
str.append(vo.getPaynature());
|
||||
str.append("</PayNature>");
|
||||
str.append("<PayType>");
|
||||
str.append("微信");
|
||||
str.append("</PayType>");
|
||||
// 当vo.getYbzhamount和ybtcamount都是0的时候,且zfamount>=0则此处用微信,其他情况用医保
|
||||
if ((vo.getYbzhamount() == null || vo.getYbzhamount().compareTo(BigDecimal.valueOf(0.00)) == 0) &&
|
||||
(vo.getYbtcamount() == null || vo.getYbtcamount().compareTo(BigDecimal.valueOf(0.00)) == 0) &&
|
||||
vo.getZfamount().compareTo(BigDecimal.valueOf(0.00)) >= 0) {
|
||||
str.append("<PayType>");
|
||||
str.append("自费");
|
||||
str.append("</PayType>");
|
||||
} else {
|
||||
str.append("<PayType>");
|
||||
str.append("医保");
|
||||
str.append("</PayType>");
|
||||
}
|
||||
str.append("<PowerTranID>");
|
||||
str.append(vo.getPowertranid());
|
||||
str.append("</PowerTranID>");
|
||||
|
||||
@@ -1206,7 +1206,10 @@ public class YbServiceImpl implements YbService {
|
||||
hisMap.put("PSN_NO", setlinfo.getStr("psn_no"));
|
||||
hisMap.put("PSN_NAME", setlinfo.getStr("psn_name"));
|
||||
hisMap.put("PSN_CERT_TYPE", setlinfo.getStr("psn_cert_type"));
|
||||
hisMap.put("CERTNO", setlinfo.getStr("certno"));
|
||||
String certno = setlinfo.getStr("certno");
|
||||
if (certno != null && !"".equals(certno)) {
|
||||
hisMap.put("CERTNO", "'" + certno + "'");
|
||||
}
|
||||
hisMap.put("GEND", setlinfo.getStr("gend"));
|
||||
if (setlinfo.getStr("naty") != null && !"".equals(setlinfo.getStr("naty"))) {
|
||||
naty = setlinfo.getStr("naty").toString();
|
||||
@@ -1708,6 +1711,7 @@ public class YbServiceImpl implements YbService {
|
||||
if (pendingDelayedTasks.add(hospOutTradeNo)) {
|
||||
scheduledExecutor.schedule(() -> {
|
||||
try {
|
||||
log.info("用户退出流程,启用延时执行findStatus方法,写入His");
|
||||
findStatus(hospOutTradeNo);
|
||||
} catch (Exception e) {
|
||||
log.error("延时执行findStatus异常", e);
|
||||
|
||||
Reference in New Issue
Block a user