From e396c4ca98190877f9bc493a65144726ebf655e7 Mon Sep 17 00:00:00 2001
From: fshenye <512914587@qq.com>
Date: Wed, 29 Jun 2022 18:30:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E8=85=B0=E6=A4=8E=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=AD=E5=8C=BB=E5=AF=BC=E5=8C=BB=E6=8E=A8=E8=8D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stc/sict/cloud/common/data/mybatis/MybatisPlusConfig.java | 4 +++-
 .../hpgp/controller/mobile/HpAppointmentEvaController.java    | 2 +-
 .../cn/sh/stc/sict/theme/hpgp/dao/HpAppointmentEvaMapper.java | 2 +-
 .../resources/mapper/{ => hpgp}/HpAppointmentEvaMapper.xml    | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)
 rename smart-health-modules/theme-schema/src/main/resources/mapper/{ => hpgp}/HpAppointmentEvaMapper.xml (97%)

diff --git a/cloud-common/cloud-common-data/src/main/java/cn/sh/stc/sict/cloud/common/data/mybatis/MybatisPlusConfig.java b/cloud-common/cloud-common-data/src/main/java/cn/sh/stc/sict/cloud/common/data/mybatis/MybatisPlusConfig.java
index 34798b7..a7e2af5 100644
--- a/cloud-common/cloud-common-data/src/main/java/cn/sh/stc/sict/cloud/common/data/mybatis/MybatisPlusConfig.java
+++ b/cloud-common/cloud-common-data/src/main/java/cn/sh/stc/sict/cloud/common/data/mybatis/MybatisPlusConfig.java
@@ -17,7 +17,9 @@ import javax.sql.DataSource;
  */
 @Configuration
 @ConditionalOnClass(MybatisPlusConfig.class)
-@MapperScan(basePackages = {"cn.sh.stc.sict.**.dao", "com.smarthealth.themestore.*.dao"})
+@MapperScan(basePackages = {"cn.sh.stc.sict.**.dao",
+		"com.smarthealth.themestore.*.dao",
+		"cn.sh.stc.sict.**.**.dao"})
 public class MybatisPlusConfig {
 
 	/**
diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpAppointmentEvaController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpAppointmentEvaController.java
index 5aaea4b..4cca7f5 100644
--- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpAppointmentEvaController.java
+++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpAppointmentEvaController.java
@@ -63,7 +63,7 @@ public class HpAppointmentEvaController {
         if(NumberUtil.isNullOrZero(eva.getPatientId())){
             return new R().error("patientId 不可为空！");
         }
-        HpAppointment app = hpAppointmentService.getById(eva.getId());
+        HpAppointment app = hpAppointmentService.getById(eva.getAppId());
         if(ObjectUtil.isNull(app)){
             return new R().error("未找到预约记录！");
         }
diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/dao/HpAppointmentEvaMapper.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/dao/HpAppointmentEvaMapper.java
index ed5c745..b891ae6 100644
--- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/dao/HpAppointmentEvaMapper.java
+++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/dao/HpAppointmentEvaMapper.java
@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 /**
  * 预约评价(HpAppointmentEva)表数据库访问层
  *
- * @author makejava
+ * @author F_xh
  * @since 2022-06-23 10:46:03
  */
 public interface HpAppointmentEvaMapper extends BaseMapper<HpAppointmentEva> {
diff --git a/smart-health-modules/theme-schema/src/main/resources/mapper/HpAppointmentEvaMapper.xml b/smart-health-modules/theme-schema/src/main/resources/mapper/hpgp/HpAppointmentEvaMapper.xml
similarity index 97%
rename from smart-health-modules/theme-schema/src/main/resources/mapper/HpAppointmentEvaMapper.xml
rename to smart-health-modules/theme-schema/src/main/resources/mapper/hpgp/HpAppointmentEvaMapper.xml
index 7b51a23..7adaef8 100644
--- a/smart-health-modules/theme-schema/src/main/resources/mapper/HpAppointmentEvaMapper.xml
+++ b/smart-health-modules/theme-schema/src/main/resources/mapper/hpgp/HpAppointmentEvaMapper.xml
@@ -32,6 +32,7 @@
                num_source_date appTime
         from hp_appointment
         where patient_id = #{patientId}
+            and eva_status = 0
         order by num_source_date desc
     </select>
 </mapper>
\ No newline at end of file
-- 
2.22.0