diff --git a/src/main/java/com/guahao/api/walkinto/service/WxPayService.java b/src/main/java/com/guahao/api/walkinto/service/WxPayService.java
index 9119c11..60bf745 100644
--- a/src/main/java/com/guahao/api/walkinto/service/WxPayService.java
+++ b/src/main/java/com/guahao/api/walkinto/service/WxPayService.java
@@ -745,10 +745,9 @@ public class WxPayService {
                         interfaceCountService.updateInterfaceConut(interfaceCount);
 
                     }else if (outTradeNo.substring(0, 2).equals("MZ")){
-                        HsjcVo hsjcvo = new HsjcVo();
-                        hsjcvo.setOrderno(outTradeNo);
-                        List<HsjcVo> list = hsjcMapper.getMzjfListByFlow(hsjcvo);
-                        hsjcvo = list.get(0);
+                        // getMzjfListByFlow
+                        HsjcVo  hsjcvo = hsjcMapper.getMzjfListByFlow2(outTradeNo);
+                        // hsjcvo = list.get(0);
 
                         hsjcMapper.updateByOutTradeNo(outTradeNo,5);
                         // refundVo.setPatientid(hsjcvo.getPatientid());
@@ -1014,10 +1013,9 @@ public class WxPayService {
                         interfaceCountService.updateInterfaceConut(interfaceCount);
 
                     }else if (outTradeNo.substring(0, 2).equals("MZ")){
-                        HsjcVo hsjcvo = new HsjcVo();
-                        hsjcvo.setOrderno(outTradeNo);
-                        List<HsjcVo> list = hsjcMapper.getMzjfListByFlow(hsjcvo);
-                        hsjcvo = list.get(0);
+                        // getMzjfListByFlow
+                        HsjcVo  hsjcvo = hsjcMapper.getMzjfListByFlow2(outTradeNo);
+                        // hsjcvo = list.get(0);
 
                         hsjcMapper.updateByOutTradeNo(outTradeNo,5);
                         refundVo.setPatientid(hsjcvo.getPatientid());
@@ -1056,13 +1054,14 @@ public class WxPayService {
                         interfaceCountService.updateInterfaceConut(interfaceCount);
 
                     }
-                    // his退费
-                    String strXML = XmlUtil.getBillsPayedRefund(refundVo);
-                    log.debug("His退费MOP_BillsPayedRefund req:" + strXML);
-                    // 发送soap请求
-                    String respXml = SoapUtil.soapMethod(strXML);
-                    log.debug("His退费MOP_BillsPayedRefund res:" + respXml);
-
+                    if (refundVo.getPaytype() != null && !refundVo.getPaytype().isEmpty() ){
+                        // his退费
+                        String strXML = XmlUtil.getBillsPayedRefund(refundVo);
+                        log.debug("His退费MOP_BillsPayedRefund req:" + strXML);
+                        // 发送soap请求
+                        String respXml = SoapUtil.soapMethod(strXML);
+                        log.debug("His退费MOP_BillsPayedRefund res:" + respXml);
+                    }
                     return "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
                 }
                 Reserve8Vo reserveVo = reserveList.get(0);
diff --git a/src/main/java/com/guahao/common/util/XmlUtil.java b/src/main/java/com/guahao/common/util/XmlUtil.java
index a3f375c..56c8c38 100644
--- a/src/main/java/com/guahao/common/util/XmlUtil.java
+++ b/src/main/java/com/guahao/common/util/XmlUtil.java
@@ -255,15 +255,11 @@ public class XmlUtil {
         str.append("<YBTCAmount>");
         str.append(vo.getYbtcamount());
         str.append("</YBTCAmount>");
-        if (vo.getYboutmsg() != null || vo.getYboutmsg() != ""){
+        if (vo.getYboutmsg() != null && !vo.getYboutmsg().isEmpty()) {
             str.append("<YBOutMsg>");
             str.append(vo.getYboutmsg());
             str.append("</YBOutMsg>");
-        }else {
-            str.append("<YBOutMsg>");
-            str.append("</YBOutMsg>");
         }
-
         str.append("<HisOperNum>");
         str.append(vo.getHisopernum());
         str.append("</HisOperNum>");
diff --git a/src/main/java/com/guahao/h5/hsjc/mapper/HsjcMapper.java b/src/main/java/com/guahao/h5/hsjc/mapper/HsjcMapper.java
index 4c9e881..5e0e65e 100644
--- a/src/main/java/com/guahao/h5/hsjc/mapper/HsjcMapper.java
+++ b/src/main/java/com/guahao/h5/hsjc/mapper/HsjcMapper.java
@@ -68,4 +68,6 @@ public interface HsjcMapper {
     List<HsjcVo> selectOrderList(String patientId);
 
     List<OrderInfoVO> selectListByStatus(String status);
+
+    HsjcVo getMzjfListByFlow2(String outTradeNo);
 }
\ No newline at end of file
diff --git a/src/main/java/com/guahao/h5/hsjc/service/HsjcService.java b/src/main/java/com/guahao/h5/hsjc/service/HsjcService.java
index 465a32f..3f3914a 100644
--- a/src/main/java/com/guahao/h5/hsjc/service/HsjcService.java
+++ b/src/main/java/com/guahao/h5/hsjc/service/HsjcService.java
@@ -215,6 +215,9 @@ public class HsjcService {
                                 item.put("price", getElementText(dataRow, "price"));
                                 item.put("category", getElementText(dataRow, "category"));
                                 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);
                             }
diff --git a/src/main/java/com/guahao/h5/reserve/controller/BingAnController.java b/src/main/java/com/guahao/h5/reserve/controller/BingAnController.java
index a061ac3..1793a12 100644
--- a/src/main/java/com/guahao/h5/reserve/controller/BingAnController.java
+++ b/src/main/java/com/guahao/h5/reserve/controller/BingAnController.java
@@ -82,9 +82,14 @@ public class BingAnController {
     }
     @RequestMapping(value = "/apiGetBAList2", method = RequestMethod.POST)
     @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 {
-            int retToken = getUserToken(userId,token);
+            int retToken = 0;
+            if (method != null && method.equals("sfs")){
+                retToken = 1;
+            }else {
+                 retToken = getUserToken(userId,token);
+            }
             if (retToken != 0) {
                 List<BingAnVO> list = null;
                 if (patientId != null && !patientId.isEmpty()) {
diff --git a/src/main/java/com/guahao/h5/sfs/controller/SfsController.java b/src/main/java/com/guahao/h5/sfs/controller/SfsController.java
index c03c45e..f820fe8 100644
--- a/src/main/java/com/guahao/h5/sfs/controller/SfsController.java
+++ b/src/main/java/com/guahao/h5/sfs/controller/SfsController.java
@@ -36,10 +36,15 @@ public class SfsController {
 
     @RequestMapping(value = "/selectGuaHaoList", method = RequestMethod.POST)
     @WebLog(description = "收费室查询用户的挂号记录")
-    public Object opRegisterCancelList(Integer userId,String token,
+    public Object opRegisterCancelList(Integer userId,String token,String method,
                                        @RequestParam("patientId") String PatientId) {
         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) {
                 List<Reserve8Vo> list = reserve8Mapper.selectGuaHaoList(PatientId);
                 return ResponseResult.success(list);
@@ -71,10 +76,15 @@ public class SfsController {
 
     @RequestMapping(value = "/selectYbByPatientId", method = RequestMethod.POST)
     @WebLog(description = "查询医保已缴费信息")
-    public Object selectYbByPatientId(Integer userId, String token,
+    public Object selectYbByPatientId(Integer userId, String token,String method,
                                       @RequestParam("patientId") String patientId) {
         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) {
                 List<OrderInfoVO> list = reserve8Mapper.selectYbByPatientId(patientId);
                 return ResponseResult.success(list);
@@ -87,10 +97,15 @@ public class SfsController {
     }
     @RequestMapping(value = "/selectOrderList", method = RequestMethod.POST)
     @WebLog(description = "查询门诊自费已缴费信息")
-    public Object selectOrderList(Integer userId, String token,
+    public Object selectOrderList(Integer userId, String token,String method,
                                   @RequestParam("patientId") String patientId) {
         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) {
                 List<HsjcVo> list = hsjcMapper.selectOrderList(patientId);
                 return ResponseResult.success(list);
diff --git a/src/main/resources/mybatis/mapper/hsjc/MzjfMapper.xml b/src/main/resources/mybatis/mapper/hsjc/MzjfMapper.xml
index 092c11c..8116cac 100644
--- a/src/main/resources/mybatis/mapper/hsjc/MzjfMapper.xml
+++ b/src/main/resources/mybatis/mapper/hsjc/MzjfMapper.xml
@@ -283,6 +283,9 @@
     <select id="selectListByStatus" resultType="com.guahao.h5.yb.model.OrderInfoVO">
         select * from order_info where status = #{status}
     </select>
+    <select id="getMzjfListByFlow2" resultType="com.guahao.h5.hsjc.vo.HsjcVo">
+        select * from user_mzjf where orderno =#{outTradeNo}
+    </select>
 
 
     <!-- 新增门诊缴费 -->