diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java
index 2d21548..f96b827 100644
--- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java
+++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java
@@ -8,6 +8,7 @@ import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.common.enums.GooodsOrderStatusEnum;
 import com.xinelu.common.enums.OrderSourceEnum;
 import com.xinelu.common.enums.OrderStatusEnum;
+import com.xinelu.common.enums.OrderTypeEnum;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.bean.BeanUtils;
 import com.xinelu.common.utils.file.FileUploadUtils;
@@ -86,9 +87,20 @@ public class AppOrderEvaluateServiceImpl implements IAppOrderEvaluateService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public AjaxResult insertGoodsOrderEvaluate(OrderEvaluateAndPictureDTO orderEvaluateAndPictureDTO) {
+        OrderEvaluateAndPictureDTO orderEvaluate = appOrderEvaluateMapper.selectOrderEvaluateAndPictureByOrderNo(orderEvaluateAndPictureDTO.getOrderNo());
+        if (Objects.nonNull(orderEvaluate)) {
+            return AjaxResult.error("当前订单已评价！");
+        }
+        //泉医模块评价判断
         if (OrderSourceEnum.SPRING_DOCTOR.getInfo().equals(orderEvaluateAndPictureDTO.getOrderSource())) {
             GoodsOrder goodsOrder = appOrderEvaluateMapper.selectGoodsOrderByOrderNo(orderEvaluateAndPictureDTO.getOrderNo());
-            if (Objects.isNull(goodsOrder) || StringUtils.isBlank(goodsOrder.getOrderStatus()) || !goodsOrder.getOrderStatus().equals(GooodsOrderStatusEnum.RECEIVED_GOODS.getInfo())) {
+            if (Objects.isNull(goodsOrder)) {
+                return AjaxResult.error("当前订单以失效，请选择其他订单信息！");
+            }
+            if (OrderTypeEnum.HEALTH_CONSULTATION.getInfo().equals(goodsOrder.getOrderType()) && (StringUtils.isBlank(goodsOrder.getOrderStatus()) || !goodsOrder.getOrderStatus().equals(GooodsOrderStatusEnum.COMPLETED.getInfo()))) {
+                return AjaxResult.error("当前订单未确认完成，请医生先确认完成后进行评价！");
+            }
+            if (!OrderTypeEnum.HEALTH_CONSULTATION.getInfo().equals(goodsOrder.getOrderType()) && (StringUtils.isBlank(goodsOrder.getOrderStatus()) || !goodsOrder.getOrderStatus().equals(GooodsOrderStatusEnum.RECEIVED_GOODS.getInfo()))) {
                 return AjaxResult.error("当前订单未确认收货，请先确认收货后进行评价！");
             }
             if (StringUtils.equals(GooodsOrderStatusEnum.EVALUATED.getInfo(), goodsOrder.getOrderStatus())) {
@@ -103,6 +115,7 @@ public class AppOrderEvaluateServiceImpl implements IAppOrderEvaluateService {
         if (insertOrderEvaluateInfo <= 0) {
             throw new ServiceException("评价失败，请联系管理员！");
         }
+        //家医评价终止
         if (OrderSourceEnum.FAMILY_DOCTOR.getInfo().equals(orderEvaluateAndPictureDTO.getOrderSource())) {
             return AjaxResult.success();
         }
diff --git a/xinelu-nurse-applet/src/main/resources/mapper/applet/apporderevaluate/AppOrderEvaluateMapper.xml b/xinelu-nurse-applet/src/main/resources/mapper/applet/apporderevaluate/AppOrderEvaluateMapper.xml
index 4aa560b..553af18 100644
--- a/xinelu-nurse-applet/src/main/resources/mapper/applet/apporderevaluate/AppOrderEvaluateMapper.xml
+++ b/xinelu-nurse-applet/src/main/resources/mapper/applet/apporderevaluate/AppOrderEvaluateMapper.xml
@@ -69,7 +69,8 @@
     </select>
 
     <select id="selectGoodsOrderByOrderNo" resultType="com.xinelu.manage.domain.goodsOrder.GoodsOrder">
-        select order_status
+        select order_status,
+               order_type
         from goods_order
         where order_no = #{orderNo}
     </select>