From c6d384cc57ccf687be19e897bead3a9c5d736317 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Wed, 1 Nov 2023 10:26:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/nursingorder/NursingOrderController.java     | 2 +-
 .../dto/apporderevaluate/OrderEvaluateAndPictureDTO.java    | 6 ------
 .../applet/service/nursingorder/INursingOrderService.java   | 2 +-
 .../service/nursingorder/impl/NursingOrderServiceImpl.java  | 2 +-
 .../applet/apporderevaluate/AppOrderEvaluateMapper.xml      | 2 --
 5 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java
index e610b29..d8cd75f 100644
--- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java
+++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java
@@ -97,7 +97,7 @@ public class NursingOrderController extends BaseController {
     }
 
     /**
-     * 根据openid编号查询对应得订单
+     * 根据parentId编号查询对应得订单
      */
     @MobileRequestAuthorization
     @GetMapping("/getAppletOrderList")
diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/apporderevaluate/OrderEvaluateAndPictureDTO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/apporderevaluate/OrderEvaluateAndPictureDTO.java
index 49d59c9..dca8016 100644
--- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/apporderevaluate/OrderEvaluateAndPictureDTO.java
+++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/apporderevaluate/OrderEvaluateAndPictureDTO.java
@@ -48,12 +48,6 @@ public class OrderEvaluateAndPictureDTO implements Serializable {
     @NotBlank(message = "请选择订单编号", groups = {Insert.class})
     private String orderNo;
 
-    /**
-     * 服务编号
-     */
-    @ApiModelProperty(value = "服务编号")
-    private String serviceCode;
-
     /**
      * 评价内容
      */
diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/INursingOrderService.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/INursingOrderService.java
index 7a1b5a1..cc482ee 100644
--- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/INursingOrderService.java
+++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/INursingOrderService.java
@@ -59,7 +59,7 @@ public interface INursingOrderService {
     AjaxResult getAppointmentDetailsInfo(String orderNo);
 
     /**
-     * 根据openid编号查询对应得订单
+     * 根据parentId编号查询对应得订单
      *
      * @param nurseOrder nurseOrder
      * @return AjaxResult
diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java
index c6b7eb2..12a948e 100644
--- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java
+++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java
@@ -132,7 +132,7 @@ public class NursingOrderServiceImpl implements INursingOrderService {
     }
 
     /**
-     * 根据openid编号查询对应得订单
+     * 根据parentId编号查询对应得订单
      *
      * @param nurseOrder nurseOrder
      * @return AjaxResult
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 11708e7..4aa560b 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
@@ -12,7 +12,6 @@
         <result property="openid" column="openid"/>
         <result property="unionid" column="unionid"/>
         <result property="orderNo" column="order_no"/>
-        <result property="serviceCode" column="service_code"/>
         <result property="evaluateContent" column="evaluate_content"/>
         <result property="evaluateChannel" column="evaluate_channel"/>
         <result property="evaluateSatisfaction" column="evaluate_satisfaction"/>
@@ -54,7 +53,6 @@
         SELECT oei.id orderEvaluateInfoId,
                oei.patient_id,
                oei.order_no,
-               oei.service_code,
                oei.evaluate_content,
                oei.evaluate_channel,
                oei.evaluate_satisfaction,