From 214b0462236390399ea184b3c4a3993fc0daf504 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 08 十二月 2023 10:10:07 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-分配治疗修改
---
phi_platform_user/src/main/java/com/hx/phip/controller/userompleteInfo/UserCompleteInfoController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/phi_platform_user/src/main/java/com/hx/phip/controller/userompleteInfo/UserCompleteInfoController.java b/phi_platform_user/src/main/java/com/hx/phip/controller/userompleteInfo/UserCompleteInfoController.java
index 3339c78..ecd1b10 100644
--- a/phi_platform_user/src/main/java/com/hx/phip/controller/userompleteInfo/UserCompleteInfoController.java
+++ b/phi_platform_user/src/main/java/com/hx/phip/controller/userompleteInfo/UserCompleteInfoController.java
@@ -9,7 +9,6 @@
import com.hx.phiappt.dao.mapper.UserContactInformationMapper;
import com.hx.phiappt.dao.mapper.UserInfoMapper;
import com.hx.phiappt.model.*;
-import com.hx.phip.dao.mapper.AppointmentMapper;
import com.hx.phip.dao.mapper.UserGeneralLabelMapper;
import com.hx.phip.dao.mapper.VisitRecordMapper;
import com.hx.phip.service.UserService;
@@ -167,13 +166,19 @@
}
// 2.鍒ゆ柇鐢ㄦ埛鎵�灞炴笭閬撴槸鍚︿负绌轰笖娓犻亾涓嶇瓑浜庤壘鑺崯鑷潵锛屼笉涓虹┖锛屽睆钄介�夋嫨娓犻亾鐨勬ā鍧楋紝涓嶈淇敼娓犻亾
//2.1 鍒ゆ柇鐢ㄦ埛鏄惁鏈夐绾﹁褰�
- sqlSentence.setSqlSentence(" isDel = 0 and userId = #{m.userId} and status = 1 ");
- int appointmentNum = commonService.selectCount(AppointmentMapper.class, sqlSentence);
- if(!StringUtils.isEmpty(user.getChannelType(),user.getChannelType2()) && !user.getChannelType2().equals("鑹捐姱鑽熻嚜鏉�") && appointmentNum == 0){
+ //sqlSentence.setSqlSentence(" isDel = 0 and userId = #{m.userId} and status = 1 ");
+ //int appointmentNum = commonService.selectCount(AppointmentMapper.class, sqlSentence);
+ if(!StringUtils.isEmpty(user.getChannelType(),user.getChannelType2()) && !user.getChannelType2().equals("鑹捐姱鑽熻嚜鏉�")){
userInfoMap.put("isExitsChannel", 1);
}else {
userInfoMap.put("isExitsChannel", 0);
}
+ //20231207 mot鎵爜鍒ゆ柇鐢ㄦ埛鏄惁鏈夋笭閬擄紝鏈夋笭閬撳垯涓嶄慨鏀�
+ if(StringUtils.isEmpty(user.getChannelType(),user.getChannelType2()) ){
+ userInfoMap.put("isShowChannel", 0);
+ }else {
+ userInfoMap.put("isShowChannel", 1);
+ }
JSONObject data = new JSONObject();
data.put("userInfo", userInfoMap);
--
Gitblit v1.8.0