Compare commits

..

No commits in common. "6a2742d5391d2e6e8481a3d322267ede2665af8e" and "126b878f3dea7b5d9801802ce5cc5de3c083fd3b" have entirely different histories.

9 changed files with 40 additions and 63 deletions

View File

@ -106,7 +106,6 @@ public class ClinicalController extends BaseController {
request.getHospitalId(),
request.getDoctorId(),
request.getLabelIden(),
request.getIsNeedLink(),
request.handleOrder()
);
@ -196,7 +195,6 @@ public class ClinicalController extends BaseController {
request.getHospitalId(),
request.getDoctorId(),
request.getLabelIden(),
request.getIsNeedLink(),
request.handleOrder()
);

View File

@ -27,7 +27,6 @@ public interface CaseClinicalArticleDao extends BaseMapper<CaseClinicalArticleMo
@Param("hospitalId") String hospitalId,
@Param("doctorId") String doctorId,
@Param("labelIden") String labelIden,
@Param("isNeedLink") Integer isNeedLink,
@Param("order") Map<String, String> order
);

View File

@ -29,7 +29,6 @@ public interface CaseClinicalVideoDao extends BaseMapper<CaseClinicalVideoModel>
@Param("hospitalId") String hospitalId,
@Param("doctorId") String doctorId,
@Param("labelIden") String labelIden,
@Param("isNeedLink") Integer isNeedLink,
@Param("order") Map<String, String> order
);

View File

@ -41,9 +41,6 @@ public class getClinicalArticleSearchPage {
@JsonProperty("is_need_num")
private Integer isNeedNum = 0;
// 是否需要外部链接0: 1:
@JsonProperty("is_need_link")
private Integer isNeedLink = 1;
// 排序字段
private OrderRequest order;

View File

@ -41,10 +41,6 @@ public class getClinicalVideoSearchPage {
@JsonProperty("is_need_num")
private Integer isNeedNum = 0;
// 是否需要外部链接0: 1:
@JsonProperty("is_need_link")
private Integer isNeedLink = 1;
// 排序字段
private OrderRequest order;

View File

@ -919,53 +919,51 @@ public class CaseClinicalVideoService {
// 增加需要增加的医院数据
addHospitalSet.add(String.valueOf(caseClinicalDoctor.getHospitalId()));
if (caseClinicalVideo.getIsLink() != 1){
// 生成用户证书-文章/视频
if (qrCodeByte == null || qrCodeByte.length == 0) {
// 生成二维码图片
if (caseClinicalVideo.getShareQrcode() == null){
try {
// 生成用户分享二维码-文章/视频
qrCodeByte = userService.CreateUserCaseClinicalUnlimitedQrcode(String.valueOf(caseClinicalVideo.getVideoId()),2);
} catch (Exception e) {
// 不处理
throw new BusinessException("-1", "无法完成此操作1");
}
}else{
// 下载二维码图片
qrCodeByte = Oss.getObjectToByte(caseClinicalVideo.getShareQrcode().replaceFirst("^/+", ""));
if (qrCodeByte == null) {
throw new BusinessException("-1", "无法完成此操作2");
}
}
}
// 下载头像
byte[] avatarByte = new byte[0];
if (caseClinicalDoctor.getAvatar() != null && !caseClinicalDoctor.getAvatar().isEmpty()) {
avatarByte = Oss.getObjectToByte(caseClinicalDoctor.getAvatar().replaceFirst("^/+", ""));
}else{
// 生成用户证书-文章/视频
if (qrCodeByte == null || qrCodeByte.length == 0) {
// 生成二维码图片
if (caseClinicalVideo.getShareQrcode() == null){
try {
avatarByte = ImageUtil.readImageToBytes("static/cert/avatar.png");
// 生成用户分享二维码-文章/视频
qrCodeByte = userService.CreateUserCaseClinicalUnlimitedQrcode(String.valueOf(caseClinicalVideo.getVideoId()),2);
} catch (Exception e) {
throw new BusinessException("-1", e.getMessage());
// 不处理
throw new BusinessException("-1", "无法完成此操作1");
}
}else{
// 下载二维码图片
qrCodeByte = Oss.getObjectToByte(caseClinicalVideo.getShareQrcode().replaceFirst("^/+", ""));
if (qrCodeByte == null) {
throw new BusinessException("-1", "无法完成此操作2");
}
}
if (avatarByte == null) {
throw new BusinessException("-1", "无法完成此操作");
}
userService.CreateUserCert(
String.valueOf(caseClinicalVideo.getVideoId()),
2,
String.valueOf(caseClinicalDoctor.getDoctorId()),
qrCodeByte,
avatarByte
);
}
// 下载头像
byte[] avatarByte = new byte[0];
if (caseClinicalDoctor.getAvatar() != null && !caseClinicalDoctor.getAvatar().isEmpty()) {
avatarByte = Oss.getObjectToByte(caseClinicalDoctor.getAvatar().replaceFirst("^/+", ""));
}else{
try {
avatarByte = ImageUtil.readImageToBytes("static/cert/avatar.png");
} catch (Exception e) {
throw new BusinessException("-1", e.getMessage());
}
}
if (avatarByte == null) {
throw new BusinessException("-1", "无法完成此操作");
}
userService.CreateUserCert(
String.valueOf(caseClinicalVideo.getVideoId()),
2,
String.valueOf(caseClinicalDoctor.getDoctorId()),
qrCodeByte,
avatarByte
);
}
if (!addHospitalSet.isEmpty()){

View File

@ -120,9 +120,7 @@ public class IndexService {
// 医院病例库推荐-2条
QueryWrapper<StatsCaseClinicalHospitalModel> statsCaseClinicalHospitalQueryWrapper = new QueryWrapper<>();
statsCaseClinicalHospitalQueryWrapper
.apply("article_num + video_num > {0}", 10) // 添加条件
.orderByDesc("article_num + video_num") // 按文章数量倒序
statsCaseClinicalHospitalQueryWrapper.orderByDesc("article_num + video_num") // 按文章数量倒序
.orderByDesc("last_push_date")
.last("LIMIT 3"); // 只取2条记录
List<StatsCaseClinicalHospitalModel> statsCaseClinicalHospitals = statsCaseClinicalHospitalDao.selectList(statsCaseClinicalHospitalQueryWrapper);
@ -134,9 +132,7 @@ public class IndexService {
// 医生病例库推荐-2条
QueryWrapper<StatsCaseClinicalDoctorModel> statsCaseClinicalDoctorQueryWrapper = new QueryWrapper<>();
statsCaseClinicalDoctorQueryWrapper
.apply("article_num + video_num > {0}", 5) // 添加条件
.orderByDesc("article_num + video_num") // 按文章数量倒序
statsCaseClinicalDoctorQueryWrapper.orderByDesc("article_num + video_num") // 按文章数量倒序
.orderByDesc("last_push_date")
.last("LIMIT 3"); // 只取2条记录
List<StatsCaseClinicalDoctorModel> statsCaseClinicalDoctors = statsCaseClinicalDoctorDao.selectList(statsCaseClinicalDoctorQueryWrapper);

View File

@ -77,9 +77,6 @@
<if test="labelIden != null and labelIden != ''">
AND l.app_iden = #{labelIden}
</if>
<if test="isNeedLink == 0">
AND l.is_link = 0
</if>
) AS result
JOIN case_clinical_article a ON a.article_id = result.article_id
<if test="order != null and !order.isEmpty()">

View File

@ -45,9 +45,6 @@
<if test="labelIden != null and labelIden != ''">
AND l.app_iden = #{labelIden}
</if>
<if test="isNeedLink == 0">
AND l.is_link = 0
</if>
<if test="order != null and !order.isEmpty()">
ORDER BY
<foreach item="entry" index="key" collection="order" separator=",">