|
@@ -9,6 +9,7 @@ import com.diagbot.entity.Concept;
|
|
import com.diagbot.enums.LexiconTypeEnum;
|
|
import com.diagbot.enums.LexiconTypeEnum;
|
|
import com.diagbot.util.CryptUtil;
|
|
import com.diagbot.util.CryptUtil;
|
|
import com.diagbot.util.RespDTOUtil;
|
|
import com.diagbot.util.RespDTOUtil;
|
|
|
|
+import com.diagbot.util.StringUtil;
|
|
import com.diagbot.vo.ConceptBaseVO;
|
|
import com.diagbot.vo.ConceptBaseVO;
|
|
import com.diagbot.vo.GetTopPatientInfoDjVO;
|
|
import com.diagbot.vo.GetTopPatientInfoDjVO;
|
|
import com.diagbot.vo.GetTopPatientInfoVO;
|
|
import com.diagbot.vo.GetTopPatientInfoVO;
|
|
@@ -45,7 +46,7 @@ public class PatientInfoFacade {
|
|
|
|
|
|
ConceptBaseVO conceptBaseVO = new ConceptBaseVO();
|
|
ConceptBaseVO conceptBaseVO = new ConceptBaseVO();
|
|
conceptBaseVO.setLibType(LexiconTypeEnum.DEPARTMENT.getKey());
|
|
conceptBaseVO.setLibType(LexiconTypeEnum.DEPARTMENT.getKey());
|
|
- if (null != getTopPatientInfoDTO.getSelfDeptName()){
|
|
|
|
|
|
+ if (StringUtil.isNotBlank(getTopPatientInfoDTO.getSelfDeptName())){
|
|
if (cryptConfiguer.cryptFlag) {
|
|
if (cryptConfiguer.cryptFlag) {
|
|
conceptBaseVO.setName(CryptUtil.encrypt_char(getTopPatientInfoDTO.getSelfDeptName()));
|
|
conceptBaseVO.setName(CryptUtil.encrypt_char(getTopPatientInfoDTO.getSelfDeptName()));
|
|
} else {
|
|
} else {
|
|
@@ -73,7 +74,7 @@ public class PatientInfoFacade {
|
|
|
|
|
|
ConceptBaseVO conceptBaseVO = new ConceptBaseVO();
|
|
ConceptBaseVO conceptBaseVO = new ConceptBaseVO();
|
|
conceptBaseVO.setLibType(LexiconTypeEnum.DEPARTMENT.getKey());
|
|
conceptBaseVO.setLibType(LexiconTypeEnum.DEPARTMENT.getKey());
|
|
- if (null != getTopPatientInfoDjDTO.getSelfDeptName()){
|
|
|
|
|
|
+ if (StringUtil.isNotBlank(getTopPatientInfoDjDTO.getSelfDeptName())){
|
|
if (cryptConfiguer.cryptFlag) {
|
|
if (cryptConfiguer.cryptFlag) {
|
|
conceptBaseVO.setName(CryptUtil.encrypt_char(getTopPatientInfoDjDTO.getSelfDeptName()));
|
|
conceptBaseVO.setName(CryptUtil.encrypt_char(getTopPatientInfoDjDTO.getSelfDeptName()));
|
|
} else {
|
|
} else {
|