nxwj/gzh-server
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新医保身份证获取方式，和his缴费字段。

Browse Source
This commit is contained in:
sangchengzhi
2026-01-09 19:13:57 +08:00
parent f8bb9dc094
commit 7202d6778e
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/CoolRequestCommonStatePersistent.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CoolRequestCommonStatePersistent"> <component name="CoolRequestCommonStatePersistent">
<option name="searchCache" value="ou" /> <option name="searchCache" value="bu" />
</component> </component>
</project> </project>

15
src/main/java/com/guahao/common/util/XmlUtil.java
View File

@@ -701,9 +701,18 @@ public class XmlUtil {
str.append("<PayNature>"); str.append("<PayNature>");
str.append(vo.getPaynature()); str.append(vo.getPaynature());
str.append("</PayNature>"); str.append("</PayNature>");
str.append("<PayType>"); // 当vo.getYbzhamount和ybtcamount都是0的时候，且zfamount>=0则此处用微信，其他情况用医保
str.append("微信"); if ((vo.getYbzhamount() == null || vo.getYbzhamount().compareTo(BigDecimal.valueOf(0.00)) == 0) &&
str.append("</PayType>"); (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("<PowerTranID>");
str.append(vo.getPowertranid()); str.append(vo.getPowertranid());
str.append("</PowerTranID>"); str.append("</PowerTranID>");

6
src/main/java/com/guahao/h5/yb/service/impl/YbServiceImpl/YbServiceImpl.java
View File

@@ -1206,7 +1206,10 @@ public class YbServiceImpl implements YbService {
hisMap.put("PSN_NO", setlinfo.getStr("psn_no")); hisMap.put("PSN_NO", setlinfo.getStr("psn_no"));
hisMap.put("PSN_NAME", setlinfo.getStr("psn_name")); hisMap.put("PSN_NAME", setlinfo.getStr("psn_name"));
hisMap.put("PSN_CERT_TYPE", setlinfo.getStr("psn_cert_type")); 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")); hisMap.put("GEND", setlinfo.getStr("gend"));
if (setlinfo.getStr("naty") != null && !"".equals(setlinfo.getStr("naty"))) { if (setlinfo.getStr("naty") != null && !"".equals(setlinfo.getStr("naty"))) {
naty = setlinfo.getStr("naty").toString(); naty = setlinfo.getStr("naty").toString();
@@ -1708,6 +1711,7 @@ public class YbServiceImpl implements YbService {
if (pendingDelayedTasks.add(hospOutTradeNo)) { if (pendingDelayedTasks.add(hospOutTradeNo)) {
scheduledExecutor.schedule(() -> { scheduledExecutor.schedule(() -> {
try { try {
log.info("用户退出流程，启用延时执行findStatus方法，写入His");
findStatus(hospOutTradeNo); findStatus(hospOutTradeNo);
} catch (Exception e) { } catch (Exception e) {
log.error("延时执行findStatus异常", e); log.error("延时执行findStatus异常", e);