Compare commits
No commits in common. "6a2742d5391d2e6e8481a3d322267ede2665af8e" and "126b878f3dea7b5d9801802ce5cc5de3c083fd3b" have entirely different histories.
6a2742d539
...
126b878f3d
@ -106,7 +106,6 @@ public class ClinicalController extends BaseController {
|
|||||||
request.getHospitalId(),
|
request.getHospitalId(),
|
||||||
request.getDoctorId(),
|
request.getDoctorId(),
|
||||||
request.getLabelIden(),
|
request.getLabelIden(),
|
||||||
request.getIsNeedLink(),
|
|
||||||
request.handleOrder()
|
request.handleOrder()
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -196,7 +195,6 @@ public class ClinicalController extends BaseController {
|
|||||||
request.getHospitalId(),
|
request.getHospitalId(),
|
||||||
request.getDoctorId(),
|
request.getDoctorId(),
|
||||||
request.getLabelIden(),
|
request.getLabelIden(),
|
||||||
request.getIsNeedLink(),
|
|
||||||
request.handleOrder()
|
request.handleOrder()
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@ -27,7 +27,6 @@ public interface CaseClinicalArticleDao extends BaseMapper<CaseClinicalArticleMo
|
|||||||
@Param("hospitalId") String hospitalId,
|
@Param("hospitalId") String hospitalId,
|
||||||
@Param("doctorId") String doctorId,
|
@Param("doctorId") String doctorId,
|
||||||
@Param("labelIden") String labelIden,
|
@Param("labelIden") String labelIden,
|
||||||
@Param("isNeedLink") Integer isNeedLink,
|
|
||||||
@Param("order") Map<String, String> order
|
@Param("order") Map<String, String> order
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@ -29,7 +29,6 @@ public interface CaseClinicalVideoDao extends BaseMapper<CaseClinicalVideoModel>
|
|||||||
@Param("hospitalId") String hospitalId,
|
@Param("hospitalId") String hospitalId,
|
||||||
@Param("doctorId") String doctorId,
|
@Param("doctorId") String doctorId,
|
||||||
@Param("labelIden") String labelIden,
|
@Param("labelIden") String labelIden,
|
||||||
@Param("isNeedLink") Integer isNeedLink,
|
|
||||||
@Param("order") Map<String, String> order
|
@Param("order") Map<String, String> order
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@ -41,9 +41,6 @@ public class getClinicalArticleSearchPage {
|
|||||||
@JsonProperty("is_need_num")
|
@JsonProperty("is_need_num")
|
||||||
private Integer isNeedNum = 0;
|
private Integer isNeedNum = 0;
|
||||||
|
|
||||||
// 是否需要外部链接(0:否 1:是)
|
|
||||||
@JsonProperty("is_need_link")
|
|
||||||
private Integer isNeedLink = 1;
|
|
||||||
|
|
||||||
// 排序字段
|
// 排序字段
|
||||||
private OrderRequest order;
|
private OrderRequest order;
|
||||||
|
|||||||
@ -41,10 +41,6 @@ public class getClinicalVideoSearchPage {
|
|||||||
@JsonProperty("is_need_num")
|
@JsonProperty("is_need_num")
|
||||||
private Integer isNeedNum = 0;
|
private Integer isNeedNum = 0;
|
||||||
|
|
||||||
// 是否需要外部链接(0:否 1:是)
|
|
||||||
@JsonProperty("is_need_link")
|
|
||||||
private Integer isNeedLink = 1;
|
|
||||||
|
|
||||||
// 排序字段
|
// 排序字段
|
||||||
private OrderRequest order;
|
private OrderRequest order;
|
||||||
|
|
||||||
|
|||||||
@ -919,7 +919,6 @@ public class CaseClinicalVideoService {
|
|||||||
// 增加需要增加的医院数据
|
// 增加需要增加的医院数据
|
||||||
addHospitalSet.add(String.valueOf(caseClinicalDoctor.getHospitalId()));
|
addHospitalSet.add(String.valueOf(caseClinicalDoctor.getHospitalId()));
|
||||||
|
|
||||||
if (caseClinicalVideo.getIsLink() != 1){
|
|
||||||
// 生成用户证书-文章/视频
|
// 生成用户证书-文章/视频
|
||||||
if (qrCodeByte == null || qrCodeByte.length == 0) {
|
if (qrCodeByte == null || qrCodeByte.length == 0) {
|
||||||
// 生成二维码图片
|
// 生成二维码图片
|
||||||
@ -966,7 +965,6 @@ public class CaseClinicalVideoService {
|
|||||||
avatarByte
|
avatarByte
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (!addHospitalSet.isEmpty()){
|
if (!addHospitalSet.isEmpty()){
|
||||||
// 增加医院统计
|
// 增加医院统计
|
||||||
|
|||||||
@ -120,9 +120,7 @@ public class IndexService {
|
|||||||
|
|
||||||
// 医院病例库推荐-2条
|
// 医院病例库推荐-2条
|
||||||
QueryWrapper<StatsCaseClinicalHospitalModel> statsCaseClinicalHospitalQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<StatsCaseClinicalHospitalModel> statsCaseClinicalHospitalQueryWrapper = new QueryWrapper<>();
|
||||||
statsCaseClinicalHospitalQueryWrapper
|
statsCaseClinicalHospitalQueryWrapper.orderByDesc("article_num + video_num") // 按文章数量倒序
|
||||||
.apply("article_num + video_num > {0}", 10) // 添加条件
|
|
||||||
.orderByDesc("article_num + video_num") // 按文章数量倒序
|
|
||||||
.orderByDesc("last_push_date")
|
.orderByDesc("last_push_date")
|
||||||
.last("LIMIT 3"); // 只取2条记录
|
.last("LIMIT 3"); // 只取2条记录
|
||||||
List<StatsCaseClinicalHospitalModel> statsCaseClinicalHospitals = statsCaseClinicalHospitalDao.selectList(statsCaseClinicalHospitalQueryWrapper);
|
List<StatsCaseClinicalHospitalModel> statsCaseClinicalHospitals = statsCaseClinicalHospitalDao.selectList(statsCaseClinicalHospitalQueryWrapper);
|
||||||
@ -134,9 +132,7 @@ public class IndexService {
|
|||||||
|
|
||||||
// 医生病例库推荐-2条
|
// 医生病例库推荐-2条
|
||||||
QueryWrapper<StatsCaseClinicalDoctorModel> statsCaseClinicalDoctorQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<StatsCaseClinicalDoctorModel> statsCaseClinicalDoctorQueryWrapper = new QueryWrapper<>();
|
||||||
statsCaseClinicalDoctorQueryWrapper
|
statsCaseClinicalDoctorQueryWrapper.orderByDesc("article_num + video_num") // 按文章数量倒序
|
||||||
.apply("article_num + video_num > {0}", 5) // 添加条件
|
|
||||||
.orderByDesc("article_num + video_num") // 按文章数量倒序
|
|
||||||
.orderByDesc("last_push_date")
|
.orderByDesc("last_push_date")
|
||||||
.last("LIMIT 3"); // 只取2条记录
|
.last("LIMIT 3"); // 只取2条记录
|
||||||
List<StatsCaseClinicalDoctorModel> statsCaseClinicalDoctors = statsCaseClinicalDoctorDao.selectList(statsCaseClinicalDoctorQueryWrapper);
|
List<StatsCaseClinicalDoctorModel> statsCaseClinicalDoctors = statsCaseClinicalDoctorDao.selectList(statsCaseClinicalDoctorQueryWrapper);
|
||||||
|
|||||||
@ -77,9 +77,6 @@
|
|||||||
<if test="labelIden != null and labelIden != ''">
|
<if test="labelIden != null and labelIden != ''">
|
||||||
AND l.app_iden = #{labelIden}
|
AND l.app_iden = #{labelIden}
|
||||||
</if>
|
</if>
|
||||||
<if test="isNeedLink == 0">
|
|
||||||
AND l.is_link = 0
|
|
||||||
</if>
|
|
||||||
) AS result
|
) AS result
|
||||||
JOIN case_clinical_article a ON a.article_id = result.article_id
|
JOIN case_clinical_article a ON a.article_id = result.article_id
|
||||||
<if test="order != null and !order.isEmpty()">
|
<if test="order != null and !order.isEmpty()">
|
||||||
|
|||||||
@ -45,9 +45,6 @@
|
|||||||
<if test="labelIden != null and labelIden != ''">
|
<if test="labelIden != null and labelIden != ''">
|
||||||
AND l.app_iden = #{labelIden}
|
AND l.app_iden = #{labelIden}
|
||||||
</if>
|
</if>
|
||||||
<if test="isNeedLink == 0">
|
|
||||||
AND l.is_link = 0
|
|
||||||
</if>
|
|
||||||
<if test="order != null and !order.isEmpty()">
|
<if test="order != null and !order.isEmpty()">
|
||||||
ORDER BY
|
ORDER BY
|
||||||
<foreach item="entry" index="key" collection="order" separator=",">
|
<foreach item="entry" index="key" collection="order" separator=",">
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user