diff --git a/src/main/java/com/example/caseData/controller/ClinicalController.java b/src/main/java/com/example/caseData/controller/ClinicalController.java index 32fe586..9059363 100644 --- a/src/main/java/com/example/caseData/controller/ClinicalController.java +++ b/src/main/java/com/example/caseData/controller/ClinicalController.java @@ -94,6 +94,7 @@ public class ClinicalController extends BaseController { request.getKeyword(), request.getHospitalId(), request.getDoctorId(), + request.getLabelIden(), request.handleOrder() ); @@ -166,6 +167,7 @@ public class ClinicalController extends BaseController { request.getKeyword(), request.getHospitalId(), request.getDoctorId(), + request.getLabelIden(), request.handleOrder() ); diff --git a/src/main/java/com/example/caseData/dao/CaseClinicalArticleDao.java b/src/main/java/com/example/caseData/dao/CaseClinicalArticleDao.java index 8351201..432409c 100644 --- a/src/main/java/com/example/caseData/dao/CaseClinicalArticleDao.java +++ b/src/main/java/com/example/caseData/dao/CaseClinicalArticleDao.java @@ -24,6 +24,7 @@ public interface CaseClinicalArticleDao extends BaseMapper order ); diff --git a/src/main/java/com/example/caseData/dao/CaseClinicalVideoDao.java b/src/main/java/com/example/caseData/dao/CaseClinicalVideoDao.java index 8c9f98f..ec85e63 100644 --- a/src/main/java/com/example/caseData/dao/CaseClinicalVideoDao.java +++ b/src/main/java/com/example/caseData/dao/CaseClinicalVideoDao.java @@ -25,6 +25,7 @@ public interface CaseClinicalVideoDao extends BaseMapper @Param("keyword") String keyword, @Param("hospitalId") String hospitalId, @Param("doctorId") String doctorId, + @Param("labelIden") String labelIden, @Param("order") Map order ); diff --git a/src/main/resources/mapper/CaseClinicalArticleMapper.xml b/src/main/resources/mapper/CaseClinicalArticleMapper.xml index f334a06..e5afc98 100644 --- a/src/main/resources/mapper/CaseClinicalArticleMapper.xml +++ b/src/main/resources/mapper/CaseClinicalArticleMapper.xml @@ -73,6 +73,9 @@ AND d.doctor_id = ${doctorId} + + AND l.app_iden = ${labelIden} + ) AS result JOIN case_clinical_article a ON a.article_id = result.article_id diff --git a/src/main/resources/mapper/CaseClinicalVideoMapper.xml b/src/main/resources/mapper/CaseClinicalVideoMapper.xml index e31d150..6b3abe7 100644 --- a/src/main/resources/mapper/CaseClinicalVideoMapper.xml +++ b/src/main/resources/mapper/CaseClinicalVideoMapper.xml @@ -41,6 +41,9 @@ AND d.doctor_id = ${doctorId} + + AND l.app_iden = ${labelIden} + ORDER BY