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 34798b7e550bc8994c699cba5464061bb6d12274..a7e2af5c109185111d8f604e2847577cb154c7bb 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 5aaea4b0ab6277c9a074286d565d244c3690972f..4cca7f5780d2e66ccc10a44dd94dbf3bc3e4ec0b 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 ed5c7453f1f0c2435e8783578e40e2220cb9e023..b891ae6c626b03b9ad0b1d0ecf5beb5b3e385dd6 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 7b51a235f817ca14d98f626f5edd4ca349b0a590..7adaef87773aec10efbbe1a36945570e8aeeeca8 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