diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/goodsOrder/impl/GoodsOrderServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/goodsOrder/impl/GoodsOrderServiceImpl.java
index 2361ab6..3cdaf8e 100644
--- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/goodsOrder/impl/GoodsOrderServiceImpl.java
+++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/goodsOrder/impl/GoodsOrderServiceImpl.java
@@ -7,15 +7,12 @@ import com.xinelu.manage.domain.goodsOrder.GoodsOrder;
 import com.xinelu.manage.dto.goodsorder.GoodsOrderDTO;
 import com.xinelu.manage.mapper.goodsOrder.GoodsOrderMapper;
 import com.xinelu.manage.service.goodsOrder.IGoodsOrderService;
-import com.xinelu.manage.vo.goodsorder.AppGoodsOrderVO;
-import com.xinelu.manage.vo.goodsorder.GoodsInfoOrderVO;
-import com.xinelu.manage.vo.goodsorder.GoodsOrderDetailsVO;
-import com.xinelu.manage.vo.goodsorder.GoodsOrderRefundVO;
-import com.xinelu.manage.vo.goodsorder.GoodsOrderVO;
+import com.xinelu.manage.vo.goodsorder.*;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
 
 
 /**
@@ -137,18 +134,20 @@ public class GoodsOrderServiceImpl implements IGoodsOrderService {
         return goodsOrderMapper.getGoodsOrderRefund(goodsOrderId);
     }
 
-	@Override public List<AppGoodsOrderVO> getConsultationOrders(GoodsOrderDTO goodsOrderDTO) {
-		return goodsOrderMapper.getConsultationOrders(goodsOrderDTO);
-	}
+    @Override
+    public List<AppGoodsOrderVO> getConsultationOrders(GoodsOrderDTO goodsOrderDTO) {
+        return goodsOrderMapper.getConsultationOrders(goodsOrderDTO);
+    }
 
-	@Override public int updateStatus(GoodsOrderDTO goodsOrderDTO) {
-		GoodsOrder goodsOrder = new GoodsOrder();
-		goodsOrder.setId(goodsOrderDTO.getGoodsOrderId());
-		goodsOrder.setOrderStatus(goodsOrderDTO.getOrderStatus());
-		return goodsOrderMapper.updateGoodsOrder(goodsOrder);
-	}
+    @Override
+    public int updateStatus(GoodsOrderDTO goodsOrderDTO) {
+        GoodsOrder goodsOrder = new GoodsOrder();
+        goodsOrder.setId(goodsOrderDTO.getGoodsOrderId());
+        goodsOrder.setOrderStatus(goodsOrderDTO.getOrderStatus());
+        return goodsOrderMapper.updateGoodsOrder(goodsOrder);
+    }
 
-	/**
+    /**
      * 查询订单信息具体明细
      *
      * @param orderNo 订单编号
diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/goodsOrder/GoodsOrderMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/goodsOrder/GoodsOrderMapper.xml
index 634adde..41e4e69 100644
--- a/xinelu-nurse-manage/src/main/resources/mapper/manage/goodsOrder/GoodsOrderMapper.xml
+++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/goodsOrder/GoodsOrderMapper.xml
@@ -499,7 +499,6 @@
             </if>
         </where>
         and gr.del_flag = 0
-        and god.del_flag = 0
     </select>
 
     <select id="selectGoodsOrderDetailsByOrderNo"