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

修改门诊退费接口和收费室权限

Browse Source
This commit is contained in:
sangchengzhi
2026-01-28 16:41:44 +08:00
parent 9073957bf0
commit 2a30428954
7 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/guahao/api/walkinto/service/WxPayService.java
View File

@@ -745,10 +745,9 @@ public class WxPayService {
interfaceCountService.updateInterfaceConut(interfaceCount); interfaceCountService.updateInterfaceConut(interfaceCount);
}else if (outTradeNo.substring(0, 2).equals("MZ")){ }else if (outTradeNo.substring(0, 2).equals("MZ")){
HsjcVo hsjcvo = new HsjcVo(); // getMzjfListByFlow
hsjcvo.setOrderno(outTradeNo); HsjcVo hsjcvo = hsjcMapper.getMzjfListByFlow2(outTradeNo);
List<HsjcVo> list = hsjcMapper.getMzjfListByFlow(hsjcvo); // hsjcvo = list.get(0);
hsjcvo = list.get(0);
hsjcMapper.updateByOutTradeNo(outTradeNo,5); hsjcMapper.updateByOutTradeNo(outTradeNo,5);
// refundVo.setPatientid(hsjcvo.getPatientid()); // refundVo.setPatientid(hsjcvo.getPatientid());
@@ -1014,10 +1013,9 @@ public class WxPayService {
interfaceCountService.updateInterfaceConut(interfaceCount); interfaceCountService.updateInterfaceConut(interfaceCount);
}else if (outTradeNo.substring(0, 2).equals("MZ")){ }else if (outTradeNo.substring(0, 2).equals("MZ")){
HsjcVo hsjcvo = new HsjcVo(); // getMzjfListByFlow
hsjcvo.setOrderno(outTradeNo); HsjcVo hsjcvo = hsjcMapper.getMzjfListByFlow2(outTradeNo);
List<HsjcVo> list = hsjcMapper.getMzjfListByFlow(hsjcvo); // hsjcvo = list.get(0);
hsjcvo = list.get(0);
hsjcMapper.updateByOutTradeNo(outTradeNo,5); hsjcMapper.updateByOutTradeNo(outTradeNo,5);
refundVo.setPatientid(hsjcvo.getPatientid()); refundVo.setPatientid(hsjcvo.getPatientid());
@@ -1056,13 +1054,14 @@ public class WxPayService {
interfaceCountService.updateInterfaceConut(interfaceCount); interfaceCountService.updateInterfaceConut(interfaceCount);
} }
if (refundVo.getPaytype() != null && !refundVo.getPaytype().isEmpty() ){
// his退费 // his退费
String strXML = XmlUtil.getBillsPayedRefund(refundVo); String strXML = XmlUtil.getBillsPayedRefund(refundVo);
log.debug("His退费MOP_BillsPayedRefund req:" + strXML); log.debug("His退费MOP_BillsPayedRefund req:" + strXML);
// 发送soap请求 // 发送soap请求
String respXml = SoapUtil.soapMethod(strXML); String respXml = SoapUtil.soapMethod(strXML);
log.debug("His退费MOP_BillsPayedRefund res:" + respXml); log.debug("His退费MOP_BillsPayedRefund res:" + respXml);
}
return "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>"; return "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
} }
Reserve8Vo reserveVo = reserveList.get(0); Reserve8Vo reserveVo = reserveList.get(0);

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

@@ -255,15 +255,11 @@ public class XmlUtil {
str.append("<YBTCAmount>"); str.append("<YBTCAmount>");
str.append(vo.getYbtcamount()); str.append(vo.getYbtcamount());
str.append("</YBTCAmount>"); str.append("</YBTCAmount>");
if (vo.getYboutmsg() != null || vo.getYboutmsg() != ""){ if (vo.getYboutmsg() != null && !vo.getYboutmsg().isEmpty()) {
str.append("<YBOutMsg>"); str.append("<YBOutMsg>");
str.append(vo.getYboutmsg()); str.append(vo.getYboutmsg());
str.append("</YBOutMsg>"); str.append("</YBOutMsg>");
}else {
str.append("<YBOutMsg>");
str.append("</YBOutMsg>");
} }
str.append("<HisOperNum>"); str.append("<HisOperNum>");
str.append(vo.getHisopernum()); str.append(vo.getHisopernum());
str.append("</HisOperNum>"); str.append("</HisOperNum>");

2
src/main/java/com/guahao/h5/hsjc/mapper/HsjcMapper.java
View File

@@ -68,4 +68,6 @@ public interface HsjcMapper {
List<HsjcVo> selectOrderList(String patientId); List<HsjcVo> selectOrderList(String patientId);
List<OrderInfoVO> selectListByStatus(String status); List<OrderInfoVO> selectListByStatus(String status);
HsjcVo getMzjfListByFlow2(String outTradeNo);
} }

3
src/main/java/com/guahao/h5/hsjc/service/HsjcService.java
View File

@@ -215,6 +215,9 @@ public class HsjcService {
item.put("price", getElementText(dataRow, "price")); item.put("price", getElementText(dataRow, "price"));
item.put("category", getElementText(dataRow, "category")); item.put("category", getElementText(dataRow, "category"));
item.put("description", getElementText(dataRow, "description")); item.put("description", getElementText(dataRow, "description"));
item.put("class", getElementText(dataRow, "class"));
item.put("program_list", getElementText(dataRow, "program_list"));
item.put("effect", getElementText(dataRow, "effect"));
dataList.add(item); dataList.add(item);
} }

9
src/main/java/com/guahao/h5/reserve/controller/BingAnController.java
View File

@@ -82,9 +82,14 @@ public class BingAnController {
} }
@RequestMapping(value = "/apiGetBAList2", method = RequestMethod.POST) @RequestMapping(value = "/apiGetBAList2", method = RequestMethod.POST)
@WebLog(description = "查询病案信息通过patientId或者住院号") @WebLog(description = "查询病案信息通过patientId或者住院号")
public Object apiGetBAList2(Integer userId,String token,String patientId,String hosNum) { public Object apiGetBAList2(Integer userId,String token,String method,String patientId,String hosNum) {
try { try {
int retToken = getUserToken(userId,token); int retToken = 0;
if (method != null && method.equals("sfs")){
retToken = 1;
}else {
retToken = getUserToken(userId,token);
}
if (retToken != 0) { if (retToken != 0) {
List<BingAnVO> list = null; List<BingAnVO> list = null;
if (patientId != null && !patientId.isEmpty()) { if (patientId != null && !patientId.isEmpty()) {

27
src/main/java/com/guahao/h5/sfs/controller/SfsController.java
View File

@@ -36,10 +36,15 @@ public class SfsController {
@RequestMapping(value = "/selectGuaHaoList", method = RequestMethod.POST) @RequestMapping(value = "/selectGuaHaoList", method = RequestMethod.POST)
@WebLog(description = "收费室查询用户的挂号记录") @WebLog(description = "收费室查询用户的挂号记录")
public Object opRegisterCancelList(Integer userId,String token, public Object opRegisterCancelList(Integer userId,String token,String method,
@RequestParam("patientId") String PatientId) { @RequestParam("patientId") String PatientId) {
try { try {
int retToken = getUserToken(userId, token); int retToken = 0;
if (method != null && method.equals("sfs")){
retToken = 1;
}else {
retToken = getUserToken(userId,token);
}
if (retToken != 0) { if (retToken != 0) {
List<Reserve8Vo> list = reserve8Mapper.selectGuaHaoList(PatientId); List<Reserve8Vo> list = reserve8Mapper.selectGuaHaoList(PatientId);
return ResponseResult.success(list); return ResponseResult.success(list);
@@ -71,10 +76,15 @@ public class SfsController {
@RequestMapping(value = "/selectYbByPatientId", method = RequestMethod.POST) @RequestMapping(value = "/selectYbByPatientId", method = RequestMethod.POST)
@WebLog(description = "查询医保已缴费信息") @WebLog(description = "查询医保已缴费信息")
public Object selectYbByPatientId(Integer userId, String token, public Object selectYbByPatientId(Integer userId, String token,String method,
@RequestParam("patientId") String patientId) { @RequestParam("patientId") String patientId) {
try { try {
int retToken = getUserToken(userId, token); int retToken = 0;
if (method != null && method.equals("sfs")){
retToken = 1;
}else {
retToken = getUserToken(userId,token);
}
if (retToken != 0) { if (retToken != 0) {
List<OrderInfoVO> list = reserve8Mapper.selectYbByPatientId(patientId); List<OrderInfoVO> list = reserve8Mapper.selectYbByPatientId(patientId);
return ResponseResult.success(list); return ResponseResult.success(list);
@@ -87,10 +97,15 @@ public class SfsController {
} }
@RequestMapping(value = "/selectOrderList", method = RequestMethod.POST) @RequestMapping(value = "/selectOrderList", method = RequestMethod.POST)
@WebLog(description = "查询门诊自费已缴费信息") @WebLog(description = "查询门诊自费已缴费信息")
public Object selectOrderList(Integer userId, String token, public Object selectOrderList(Integer userId, String token,String method,
@RequestParam("patientId") String patientId) { @RequestParam("patientId") String patientId) {
try { try {
int retToken = getUserToken(userId, token); int retToken = 0;
if (method != null && method.equals("sfs")){
retToken = 1;
}else {
retToken = getUserToken(userId,token);
}
if (retToken != 0) { if (retToken != 0) {
List<HsjcVo> list = hsjcMapper.selectOrderList(patientId); List<HsjcVo> list = hsjcMapper.selectOrderList(patientId);
return ResponseResult.success(list); return ResponseResult.success(list);

3
src/main/resources/mybatis/mapper/hsjc/MzjfMapper.xml
View File

@@ -283,6 +283,9 @@
<select id="selectListByStatus" resultType="com.guahao.h5.yb.model.OrderInfoVO"> <select id="selectListByStatus" resultType="com.guahao.h5.yb.model.OrderInfoVO">
select * from order_info where status = #{status} select * from order_info where status = #{status}
</select> </select>
<select id="getMzjfListByFlow2" resultType="com.guahao.h5.hsjc.vo.HsjcVo">
select * from user_mzjf where orderno =#{outTradeNo}
</select>
<!-- 新增门诊缴费 --> <!-- 新增门诊缴费 -->