底包升级导致的getOne方法修改

aipt-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -57,7 +57,7 @@ public class ConceptFacade extends ConceptServiceImpl {
         conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("lib_name", conceptBaseVO.getName())
                 .eq("lib_type", conceptBaseVO.getLibType());
-        Concept concept = this.getOne(conceptQueryWrapper);
+        Concept concept = this.getOne(conceptQueryWrapper, false);
         if (concept == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "概念不存在");
         }
@@ -75,7 +75,7 @@ public class ConceptFacade extends ConceptServiceImpl {
         conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("lib_name", conceptBaseVO.getName())
                 .eq("lib_type", conceptBaseVO.getLibType());
-        Concept concept = this.getOne(conceptQueryWrapper);
+        Concept concept = this.getOne(conceptQueryWrapper, false);
         return concept;
     }
 

aipt-service/src/main/java/com/diagbot/facade/DeptInfoFacade.java

@@ -43,7 +43,7 @@ public class DeptInfoFacade {
         deptInfoDTOQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("lib_name", hospitalDeptInfoDTORespDTO.data.getConceptDeptName())
                 .eq("lib_type", LexiconTypeEnum.DEPARTMENT.getKey());
-        Concept deptInfo = conceptFacade.getOne(deptInfoDTOQueryWrapper);
+        Concept deptInfo = conceptFacade.getOne(deptInfoDTOQueryWrapper, false);
         DeptInfoDTO deptInfoDTO = new DeptInfoDTO();
         deptInfoDTO.setConceptId(deptInfo.getId());
         deptInfoDTO.setName(deptInfo.getLibName());

aipt-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -49,7 +49,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
                 .eq("STATUS", StatusEnum.Enable.getKey())
                 .orderByDesc("gmt_modified");
 
-        VersionInfo versionInfo = getOne(versionInfoQuery);
+        VersionInfo versionInfo = getOne(versionInfoQuery, false);
         VersionWrapperDTO versionList = new VersionWrapperDTO();
 
         if (versionInfo != null) {

diagbotman-service/src/main/java/com/diagbot/facade/ProductServiceFacade.java

@@ -76,7 +76,7 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
         openedProductsQueryWrapper.eq("product_id", lantoneProduct.getId()).eq("user_id", userId);
         List<OpenedProducts> openedProductsList = openedProductsFacade.list(openedProductsQueryWrapper);
         openedProductsQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-        OpenedProducts openedProducts = openedProductsFacade.getOne(openedProductsQueryWrapper);
+        OpenedProducts openedProducts = openedProductsFacade.getOne(openedProductsQueryWrapper, false);
         if (!productServiceSaveVO.getType().equals(TokenTypeEnum.Trial.getKey())) {
             if (openedProductsList.size() == 0) {
                 throw new CommonException(CommonErrorCode.NOT_EXISTS,
@@ -105,7 +105,7 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
         qwps.eq("product_id", productServiceSaveVO.getProductId());
         qwps.eq("service_id", productServiceSaveVO.getServiceId());
         qwps.eq("is_deleted", IsDeleteEnum.N.getKey());
-        ProductService productService = this.getOne(qwps);
+        ProductService productService = this.getOne(qwps, false);
         if (productService == null) {
             productService = new ProductService();
             productService.setProductId(productServiceSaveVO.getProductId());

diagbotman-service/src/main/java/com/diagbot/facade/ServiceInfoFacade.java

@@ -46,7 +46,7 @@ public class ServiceInfoFacade extends ServiceInfoServiceImpl {
         qw.eq("name", serviceSaveVO.getName()).
                 eq("user_id", userId).
                 eq("is_deleted", IsDeleteEnum.N.getKey());
-        ServiceInfo serviceInfo = this.getOne(qw);
+        ServiceInfo serviceInfo = this.getOne(qw, false);
         if (serviceInfo != null) {
             throw new CommonException(CommonErrorCode.IS_EXISTS,
                     "该用户已建立服务端【" + serviceSaveVO.getName() + "】，不允许重复建立");

diagbotman-service/src/main/java/com/diagbot/facade/ServiceTokenFacade.java

@@ -82,7 +82,7 @@ public class ServiceTokenFacade extends ServiceTokenServiceImpl {
             queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
             queryWrapper.eq("user_id", st.getUserId());
             queryWrapper.eq("product_id", st.getProductId());
-            OpenedProducts op = openedProductsFacade.getOne(queryWrapper);
+            OpenedProducts op = openedProductsFacade.getOne(queryWrapper, false);
             if (op == null) {
                 throw new CommonException(CommonErrorCode.NOPERMISSION_ERROR);
             }
@@ -256,6 +256,6 @@ public class ServiceTokenFacade extends ServiceTokenServiceImpl {
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             queryWrapper.eq(entry.getKey(), entry.getValue());
         }
-        return this.getOne(queryWrapper);
+        return this.getOne(queryWrapper, false);
     }
 }

icss-service/src/main/java/com/diagbot/facade/DoctorPageModeFacade.java

@@ -38,7 +38,7 @@ public class DoctorPageModeFacade extends DoctorPageModeServiceImpl {
         mapAll.put("mode_classify", doctorPageModeVO.getModeClassify());
         mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
         doctorPageModeWrapper.allEq(mapAll);
-        DoctorPageMode datas = getOne(doctorPageModeWrapper);
+        DoctorPageMode datas = getOne(doctorPageModeWrapper, false);
         boolean res = false;
         if (datas != null) {
             UpdateWrapper<DoctorPageMode> doctorPageModeUpdate = new UpdateWrapper<>();

icss-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -131,7 +131,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         inquiryInfoQe.eq("doctor_id", saveInquiryVO.getDoctorId());
         inquiryInfoQe.eq("patient_id", saveInquiryVO.getPatientId());
         inquiryInfoQe.eq("inquiry_code", saveInquiryVO.getInquiryCode());
-        InquiryInfo inquiryInfo = getOne(inquiryInfoQe);
+        InquiryInfo inquiryInfo = getOne(inquiryInfoQe, false);
 
         if (inquiryInfo == null) {
         	inquiryInfo = new InquiryInfo();
@@ -218,7 +218,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         queryWrapper.eq("doctor_id", readInquiryVO.getDoctorId());
         queryWrapper.eq("patient_id", readInquiryVO.getPatientId());
         queryWrapper.eq("inquiry_code", readInquiryVO.getInquiryCode());
-        InquiryInfo inquiryInfo = this.getOne(queryWrapper);
+        InquiryInfo inquiryInfo = this.getOne(queryWrapper, false);
 
         if (inquiryInfo != null) {
             //readInquiryDTO.setDataJson(inquiryInfo.getDataJson());
@@ -235,7 +235,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
             QueryWrapper<InquiryEvaluation> inquiryEvaluationQe = new QueryWrapper<>();
             inquiryEvaluationQe.eq("inquiry_id", inquiryInfo.getId());
-            readInquiryDTO.setInquiryEvaluation(inquiryEvaluationFacade.getOne(inquiryEvaluationQe));
+            readInquiryDTO.setInquiryEvaluation(inquiryEvaluationFacade.getOne(inquiryEvaluationQe, false));
 
             QueryWrapper<InquiryScale> inquiryScaleQe = new QueryWrapper<>();
             inquiryScaleQe.eq("inquiry_id", inquiryInfo.getId());
@@ -275,7 +275,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
             inquiryDetailQe.eq("inquiry_id", inquiryInfo.getId());
             inquiryDetailQe.eq("type", 3);
-            InquiryDetail inquiryDetail = inquiryDetailFacade.getOne(inquiryDetailQe);
+            InquiryDetail inquiryDetail = inquiryDetailFacade.getOne(inquiryDetailQe, false);
             if (inquiryDetail != null) {
                 getLastOtherDTO.setOtherStr(inquiryDetail.getContent());
             }

icss-service/src/main/java/com/diagbot/facade/PatientInfoFacade.java

@@ -62,7 +62,7 @@ public class PatientInfoFacade {
         QueryWrapper<DoctorPageMode> doctorPageModeQe = new QueryWrapper<>();
         doctorPageModeQe.eq("is_deleted", IsDeleteEnum.N.getKey());
         doctorPageModeQe.eq("doctor_id", getTopPatientInfoDTO.getDoctorId());
-        DoctorPageMode doctorPageMode = doctorPageModeFacade.getOne(doctorPageModeQe);
+        DoctorPageMode doctorPageMode = doctorPageModeFacade.getOne(doctorPageModeQe, false);
         if (doctorPageMode != null) {
             getTopPatientInfoDTO.setModeClassify(doctorPageMode.getModeClassify());
             getTopPatientInfoDTO.setModeValue(doctorPageMode.getModeValue());

icss-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -105,7 +105,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("tag_name", name).eq("type", type);
-        QuestionInfo questionInfo = this.getOne(questionInfoQueryWrapper);
+        QuestionInfo questionInfo = this.getOne(questionInfoQueryWrapper, false);
         return questionInfo;
     }
 

icss-service/src/main/java/com/diagbot/facade/TemplateInfoFacade.java

@@ -91,7 +91,7 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
         mapAll.put("name", templateInfoRevampVO.getModeName());
         //mapAll.put("type", templateInfoRevampVO.getType());
         templates.allEq(mapAll);
-        TemplateInfo datas = getOne(templates);
+        TemplateInfo datas = getOne(templates, false);
         if (datas != null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该模板名已存在");
         }
@@ -219,7 +219,7 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
         templateInfoQuery.eq("id", templateIdVO.getId())
         .eq("is_deleted", IsDeleteEnum.N.getKey());    
         TemplateInfoDTO data = new TemplateInfoDTO();
-        TemplateInfo datas = getOne(templateInfoQuery);
+        TemplateInfo datas = getOne(templateInfoQuery, false);
         //过滤
         BeanUtil.copyProperties(datas, data);
         return data;

icssman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -84,7 +84,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
         moduleInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
                 .eq("id",ids);
-        ModuleInfo moduleInfo = this.getOne(moduleInfoQueryWrapper);
+        ModuleInfo moduleInfo = this.getOne(moduleInfoQueryWrapper, false);
         String userId = UserUtils.getCurrentPrincipleID();
         Date date = DateUtil.now();
         if(null != moduleInfo){
@@ -418,7 +418,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
         moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("id", getModuleInfoOneVO.getModuleId());
-        ModuleInfo moduleInfo = this.getOne(moduleInfoQueryWrapper);
+        ModuleInfo moduleInfo = this.getOne(moduleInfoQueryWrapper, false);
         //获取模板类型名称
         if(moduleInfo.getModuleType().intValue() == 1){
             deptId.add(moduleInfo.getRelationId());

icssman-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -202,7 +202,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                     if (ques.getId() != null) {
                         ques = this.getOne(new QueryWrapper<QuestionInfo>()
                                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                                .eq("id", ques.getId()));
+                                .eq("id", ques.getId()), false);
                         if (ques == null) {
                             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "标签被修改，请刷新后重新保存");
                         }
@@ -385,7 +385,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         if (questionWrapper.getId() != null) {
             questionInfo = this.getOne(new QueryWrapper<QuestionInfo>()
                     .eq("id", questionWrapper.getId())
-                    .eq("is_deleted", IsDeleteEnum.N.getKey()));
+                    .eq("is_deleted", IsDeleteEnum.N.getKey()), false);
             if (questionInfo == null) { //校验
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "标签不存在");
             }

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -448,7 +448,7 @@ public class ConceptFacade extends ConceptServiceImpl {
         if (lexicon.getIsHasCommon() == 1) {
             QueryWrapper<ConceptCommon> conceptCommonQe = new QueryWrapper<>();
             conceptCommonQe.eq("concept_id", getConceptInfoDetailVO.getConceptId());
-            ConceptCommon conceptCommon = conceptCommonFacade.getOne(conceptCommonQe);
+            ConceptCommon conceptCommon = conceptCommonFacade.getOne(conceptCommonQe, false);
             if (conceptCommon != null) {
                 getConceptInfoDTO.setSexType(conceptCommon.getSexType());
                 getConceptInfoDTO.setMinAge(conceptCommon.getMinAge());
@@ -459,7 +459,7 @@ public class ConceptFacade extends ConceptServiceImpl {
         if(LexiconTypeEnum.DIAGNOSIS.getKey()==concept.getLibType().intValue()){
         	QueryWrapper<Disease> diseaseQe = new QueryWrapper<>();
         	diseaseQe.eq("concept_id", concept.getId());
-        	Disease disease = diseaseFacade.getOne(diseaseQe);
+        	Disease disease = diseaseFacade.getOne(diseaseQe, false);
         	if(disease!=null){
         		getConceptInfoDTO.setDeptId(disease.getDeptId());
         		getConceptInfoDTO.setClassify(disease.getClassify());
@@ -508,7 +508,7 @@ public class ConceptFacade extends ConceptServiceImpl {
 
         QueryWrapper<Lexicon> lexiconQe = new QueryWrapper<>();
         lexiconQe.eq("name", addConceptInfoVO.getType());
-        Lexicon lexicon = lexiconFacade.getOne(lexiconQe);
+        Lexicon lexicon = lexiconFacade.getOne(lexiconQe, false);
         if (lexicon == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, lineNumStr + "数据有误，该类型信息在数据库中不存在！");
         }
@@ -632,7 +632,7 @@ public class ConceptFacade extends ConceptServiceImpl {
         if (lexicon.getIsHasCommon() == 1) {
             QueryWrapper<ConceptCommon> conceptCommonQe = new QueryWrapper<>();
             conceptCommonQe.eq("concept_id", conceptId);
-            ConceptCommon conceptCommon = conceptCommonFacade.getOne(conceptCommonQe);
+            ConceptCommon conceptCommon = conceptCommonFacade.getOne(conceptCommonQe, false);
             if (conceptCommon == null) {
                 conceptCommon = new ConceptCommon();
                 conceptCommon.setGmtCreate(now);
@@ -650,7 +650,7 @@ public class ConceptFacade extends ConceptServiceImpl {
         if(lexicon.getName().equals(LexiconTypeEnum.DIAGNOSIS.getName())){
         	QueryWrapper<Disease> diseaseQe = new QueryWrapper<>();
         	diseaseQe.eq("concept_id", conceptId);
-        	Disease disease = diseaseFacade.getOne(diseaseQe);
+        	Disease disease = diseaseFacade.getOne(diseaseQe, false);
         	if(disease==null){
         		disease = new Disease();
         		disease.setGmtCreate(now);
@@ -664,7 +664,7 @@ public class ConceptFacade extends ConceptServiceImpl {
         		QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
         		conceptQe.eq("lib_name", "全科");
         		conceptQe.eq("lib_type", LexiconTypeEnum.DEPARTMENT.getKey());
-        		disease.setDeptId(getOne(conceptQe).getId());
+        		disease.setDeptId(getOne(conceptQe, false).getId());
         		disease.setClassify(DiseaseClassifyEnum.LevelFirst.getName());
         	}else{
         		BeanUtil.copyProperties(addConceptInfoVO.getAddCptDiseaseExtVO(), disease);
@@ -1086,7 +1086,7 @@ public class ConceptFacade extends ConceptServiceImpl {
             QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
     		conceptQe.eq("lib_name", "全科");
     		conceptQe.eq("lib_type", LexiconTypeEnum.DEPARTMENT.getKey());
-    		Concept deptConcept = getOne(conceptQe);
+    		Concept deptConcept = getOne(conceptQe, false);
 
             List<Disease> saveDiseaseList = Lists.newArrayList();
             disExtConList.forEach(i->{

knowledgeman-service/src/main/java/com/diagbot/facade/DiagnoseFacade.java

@@ -242,7 +242,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("is_concept", 1)
                     .eq("type_id", LexiconTypeEnum.DIAGNOSIS.getKey())
-                    .eq("name", detailList.get(0).getDisName())
+                    .eq("name", detailList.get(0).getDisName()), false
             );
             if (libraryInfo == null) {
                 res.setDisNameExist(false);
@@ -728,7 +728,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
         if (diagnoseWrapper.getId() != null) {
             queryWrapper.ne("id", diagnoseWrapper.getId());
         }
-//        Diagnose bean = this.getOne(queryWrapper);
+//        Diagnose bean = this.getOne(queryWrapper, false);
         if (this.count(queryWrapper) > 0) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,"当前疾病的诊断依据已存在！");
         }

knowledgeman-service/src/main/java/com/diagbot/facade/LexiconFacade.java

@@ -87,7 +87,7 @@ public class LexiconFacade extends LexiconServiceImpl {
 
         QueryWrapper<Lexicon> lexiconQe = new QueryWrapper<>();
         lexiconQe.eq("name", addLexiconVO.getName());
-        Lexicon lexicon = getOne(lexiconQe);
+        Lexicon lexicon = getOne(lexiconQe, false);
         if (lexicon == null) {
             lexicon = new Lexicon();
             lexicon.setName(addLexiconVO.getName());

knowledgeman-service/src/main/java/com/diagbot/facade/LisMappingFacade.java

@@ -227,7 +227,7 @@ public class LisMappingFacade extends LisMappingServiceImpl {
         conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("lib_name", getUniqueNameVO.getMealName())
                 .eq("lib_type", LexiconTypeEnum.LIS_PACKAGE.getKey());
-        Concept mealConcept = conceptFacade.getOne(conceptQueryWrapper);
+        Concept mealConcept = conceptFacade.getOne(conceptQueryWrapper, false);
         if (mealConcept == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "化验大项【" + getUniqueNameVO.getMealName() + "】不存在");
         }
@@ -237,7 +237,7 @@ public class LisMappingFacade extends LisMappingServiceImpl {
             conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("lib_name", getUniqueNameVO.getItemName())
                     .eq("lib_type", LexiconTypeEnum.LIS_DETAILS.getKey());
-            itemConcept = conceptFacade.getOne(conceptQueryWrapper);
+            itemConcept = conceptFacade.getOne(conceptQueryWrapper, false);
             if (itemConcept == null) {
                 throw new CommonException(CommonErrorCode.NOT_EXISTS, "化验小项【" + getUniqueNameVO.getItemName() + "】不存在");
             }

knowledgeman-service/src/main/java/com/diagbot/facade/RelationFacade.java

@@ -197,7 +197,7 @@ public class RelationFacade extends RelationServiceImpl {
 		libraryInfoQe1.eq("is_concept", 1);
 		libraryInfoQe1.eq("name", addRelationInfoVO.getStartName());
 		libraryInfoQe1.eq("type_id", LexiconTypeEnum.getKey(addRelationInfoVO.getStartType()));
-		LibraryInfo startLibraryInfo = libraryInfoFacade.getOne(libraryInfoQe1);
+		LibraryInfo startLibraryInfo = libraryInfoFacade.getOne(libraryInfoQe1, false);
 		if(startLibraryInfo==null){
 			retMap.put("message", "数据库中无该起始术语！");
 			return retMap;
@@ -221,7 +221,7 @@ public class RelationFacade extends RelationServiceImpl {
 		libraryInfoQe2.eq("is_concept", 1);
 		libraryInfoQe2.eq("name", addRelationInfoVO.getEndName());
 		libraryInfoQe2.eq("type_id", LexiconTypeEnum.getKey(addRelationInfoVO.getEndType()));
-		LibraryInfo endLibraryInfo = libraryInfoFacade.getOne(libraryInfoQe2);
+		LibraryInfo endLibraryInfo = libraryInfoFacade.getOne(libraryInfoQe2, false);
 		if(endLibraryInfo==null){
 			retMap.put("message", "数据库中无该终点术语");
 			return retMap;
@@ -243,7 +243,7 @@ public class RelationFacade extends RelationServiceImpl {
 		QueryWrapper<LexiconRelationship> lexiconRelationshipQe = new QueryWrapper<>();
 		lexiconRelationshipQe.eq("is_deleted", "N");
 		lexiconRelationshipQe.eq("name", addRelationInfoVO.getRelationName());
-		LexiconRelationship lexiconRelationship = lexiconRelationshipFacade.getOne(lexiconRelationshipQe);
+		LexiconRelationship lexiconRelationship = lexiconRelationshipFacade.getOne(lexiconRelationshipQe, false);
 		if(lexiconRelationship==null){
 			retMap.put("message", "该关系信息在数据库中不存在");
 			return retMap;
@@ -253,7 +253,7 @@ public class RelationFacade extends RelationServiceImpl {
 		relationQe.eq("start_id", startConcept.getId());
 		relationQe.eq("end_id", endConcept.getId());
 		relationQe.eq("relation_id", lexiconRelationship.getId());
-		Relation relation = getOne(relationQe);
+		Relation relation = getOne(relationQe, false);
 		
 		String currentUser = UserUtils.getCurrentPrincipleID();
 		Date now = DateUtil.now();

knowledgeman-service/src/main/java/com/diagbot/facade/VersionDetailFacade.java

@@ -245,7 +245,7 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
         // 1.先判断数据是否存在有效
         QueryWrapper<VersionDetail> VersionInfoFand = new QueryWrapper<>();
         VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
-        VersionDetail versionDetail = getOne(VersionInfoFand);
+        VersionDetail versionDetail = getOne(VersionInfoFand, false);
         if (null == versionDetail) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
         }
@@ -263,7 +263,7 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
         QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
         VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("id", id);
-        VersionInfo versionInfo = versionInfoServiceImpl.getOne(VersionInfoFand);
+        VersionInfo versionInfo = versionInfoServiceImpl.getOne(VersionInfoFand, false);
         if (null == versionInfo) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "主版本号数据不存在");
         }

knowledgeman-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -137,7 +137,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
                 .eq("name", versionInfoVO.getName())
                 .eq("is_deleted", IsDeleteEnum.N.getKey());
 
-        VersionInfo dataInfo = getOne(templateInfoFand);
+        VersionInfo dataInfo = getOne(templateInfoFand, false);
         if (dataInfo != null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该产品该版本号已存在");
         }
@@ -216,7 +216,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
                 .eq("name", versionInfoVO.getName())
                 .eq("is_deleted", IsDeleteEnum.N.getKey());
 
-        VersionInfo dataInfo = getOne(templateInfoFand);
+        VersionInfo dataInfo = getOne(templateInfoFand, false);
         if (dataInfo != null && !dataInfo.getId().equals(versionInfoVO.getId())) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该产品该版本号已存在");
         }
@@ -274,7 +274,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
         VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("id", id);
-        VersionInfo versionInfo = getOne(VersionInfoFand);
+        VersionInfo versionInfo = getOne(VersionInfoFand, false);
         if (null == versionInfo) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
         }
@@ -302,7 +302,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
                 .eq("STATUS", StatusEnum.Enable.getKey())
                 .orderByDesc("gmt_modified");
 
-        VersionInfo versionInfo = getOne(versionInfoQuery);
+        VersionInfo versionInfo = getOne(versionInfoQuery, false);
         VersionSpecDTO versionList = new VersionSpecDTO();
 
         if (versionInfo != null) {

prec-service/src/main/java/com/diagbot/facade/InquiryEvaluatorFacade.java

@@ -57,7 +57,7 @@ public class InquiryEvaluatorFacade extends InquiryEvaluatorServiceImpl {
         inquiryInfoQe.eq("doctor_id", addEvaluatorVO.getDoctorId());
         inquiryInfoQe.eq("patient_id", addEvaluatorVO.getPatientId());
         inquiryInfoQe.eq("inquiry_code", addEvaluatorVO.getInquiryCode());
-        InquiryInfo inquiryInfo = inquiryInfoFacade.getOne(inquiryInfoQe);
+        InquiryInfo inquiryInfo = inquiryInfoFacade.getOne(inquiryInfoQe, false);
 
         Date now = DateUtil.now();
 

prec-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -75,7 +75,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         inquiryInfoQe.eq("doctor_id", saveInquiryVO.getDoctorId());
         inquiryInfoQe.eq("patient_id", saveInquiryVO.getPatientId());
         inquiryInfoQe.eq("inquiry_code", saveInquiryVO.getInquiryCode());
-        InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe);
+        InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe, false);
 
         if (inquiryInfo == null) {
             inquiryInfo = new InquiryInfo();
@@ -134,7 +134,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         inquiryInfoQe.eq("doctor_id", recordCheckVO.getDoctorId());
         inquiryInfoQe.eq("patient_id", recordCheckVO.getPatientId());
         inquiryInfoQe.eq("inquiry_code", recordCheckVO.getInquiryCode());
-        InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe);
+        InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe, false);
 
         if (inquiryInfo != null) {
             QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
@@ -237,7 +237,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getPatientIdNo()), "patient_id_no", getInquiryDetailVO.getPatientIdNo());
         inquiryInfoQe.eq("inquiry_code", getInquiryDetailVO.getInquiryCode());
 
-        InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe);
+        InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe, false);
         if (inquiryInfo == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该病历不存在！");
         }

precman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -75,7 +75,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
         moduleInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
                 .eq("id",ids);
-        ModuleInfo moduleInfo = this.getOne(moduleInfoQueryWrapper);
+        ModuleInfo moduleInfo = this.getOne(moduleInfoQueryWrapper, false);
         String userId = UserUtils.getCurrentPrincipleID();
         Date date = DateUtil.now();
         if(null != moduleInfo){
@@ -239,7 +239,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
         moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("id", getModuleInfoOneVO.getModuleId());
-        ModuleInfo moduleInfo = this.getOne(moduleInfoQueryWrapper);
+        ModuleInfo moduleInfo = this.getOne(moduleInfoQueryWrapper, false);
         if(null != moduleInfo){
             //获取模板类型名称
             if(moduleInfo.getModuleType().intValue() == 1){

precman-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -226,7 +226,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         if (questionWrapper.getId() != null) {
             questionInfo = this.getOne(new QueryWrapper<QuestionInfo>()
                     .eq("id", questionWrapper.getId())
-                    .eq("is_deleted", IsDeleteEnum.N.getKey()));
+                    .eq("is_deleted", IsDeleteEnum.N.getKey()), false);
             if (questionInfo == null) { //校验
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "标签不存在");
             }

tran-service/src/main/java/com/diagbot/facade/DataServiceFacade.java

@@ -33,7 +33,7 @@ public class DataServiceFacade {
         QueryWrapper<HospitalInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("code", hosCodeVO.getHosCode());
-        HospitalInfo hospitalInfo = hospitalInfoFacade.getOne(queryWrapper);
+        HospitalInfo hospitalInfo = hospitalInfoFacade.getOne(queryWrapper, false);
         if (hospitalInfo == null) {
             return false;
         } else {

tran-service/src/main/java/com/diagbot/facade/HospitalDeptFacade.java

@@ -41,7 +41,7 @@ public class HospitalDeptFacade extends HospitalDeptServiceImpl {
         hospitalDeptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_code", hospitalDeptInfoVO.getHospitalCode())
                 .eq("code", hospitalDeptInfoVO.getDeptCode());
-        HospitalDept hospitalDept = this.getOne(hospitalDeptQueryWrapper);
+        HospitalDept hospitalDept = this.getOne(hospitalDeptQueryWrapper, false);
         BeanUtil.copyProperties(hospitalDept, hospitalDeptInfoDTO);
         return hospitalDeptInfoDTO;
     }

tran-service/src/main/java/com/diagbot/facade/HospitalInfoFacade.java

@@ -35,7 +35,7 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
 		QueryWrapper<HospitalInfo> queryWrapper = new QueryWrapper<HospitalInfo>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
         			.in("code", hospitalInfoVO.getCode());
-        HospitalInfo datas = this.getOne(queryWrapper);
+        HospitalInfo datas = this.getOne(queryWrapper, false);
         HospitalInfoDTO data =new HospitalInfoDTO();
         BeanUtil.copyProperties(datas, data);
         return data;

tran-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -64,7 +64,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl{
         inquiryInfoQe.eq("doctor_id", saveInquiryToHisVO.getDoctorId());
         inquiryInfoQe.eq("patient_id", saveInquiryToHisVO.getPatientId());
         inquiryInfoQe.eq("inquiry_code", saveInquiryToHisVO.getInquiryCode());
-        InquiryInfo inquiryInfo = getOne(inquiryInfoQe);
+        InquiryInfo inquiryInfo = getOne(inquiryInfoQe, false);
 
         if (inquiryInfo == null) {
         	inquiryInfo = new InquiryInfo();

user-service/src/main/java/com/diagbot/facade/UserAuthenticationFacade.java

@@ -78,7 +78,7 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         QueryWrapper<Organization> qwOrganization = new QueryWrapper<>();
         qwOrganization.eq("name", userAuthenticationVO.getOrganization()).
                 eq("is_deleted", IsDeleteEnum.N.getKey());
-        Organization organization = organizationFacade.getOne(qwOrganization);
+        Organization organization = organizationFacade.getOne(qwOrganization, false);
         if (organization == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
                     "找不到机构【" + userAuthenticationVO.getOrganization() + "】");
@@ -99,7 +99,7 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         qwAuthentication.eq("user_id", userId).
                 eq("status", AuthHandleEnum.UNHandle.getKey()).
                 eq("is_deleted", IsDeleteEnum.N.getKey());
-        UserAuthentication userAuthentication = this.getOne(qwAuthentication);
+        UserAuthentication userAuthentication = this.getOne(qwAuthentication, false);
         //有未处理的认证信息，先做已处理
         if (userAuthentication != null) {
             userAuthentication.setStatus(AuthHandleEnum.Handled.getKey());
@@ -144,7 +144,7 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
                 eq("status", AuthHandleEnum.Handled.getKey()).
                 eq("is_deleted", IsDeleteEnum.N.getKey()).
                 orderByDesc("gmt_create");
-        UserAuthentication userAuthentication = this.getOne(qw);
+        UserAuthentication userAuthentication = this.getOne(qw, false);
         UserAuthenticationDTO userAuthenticationDTO = new UserAuthenticationDTO();
         userAuthenticationDTO.setUserId(user.getId());
         userAuthenticationDTO.setUsername(user.getUsername());
@@ -227,7 +227,7 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         qw.eq("user_id", userId).
                 eq("is_deleted", IsDeleteEnum.N.getKey()).
                 orderByDesc("gmt_create");
-        UserAuthentication userAuthentication = this.getOne(qw);
+        UserAuthentication userAuthentication = this.getOne(qw, false);
         if (userAuthentication != null) {
             map.put("userAuthentication", userAuthentication);
         }
@@ -261,7 +261,7 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
     	     qw.eq("user_id", userId).
     	                eq("is_deleted", IsDeleteEnum.N.getKey()).
     	                orderByDesc("gmt_create");
-    	     UserAuthentication userAuthentication = this.getOne(qw);
+    	     UserAuthentication userAuthentication = this.getOne(qw, false);
     	     if(userAuthentication!=null&&userAuthentication.getIsReject()==0){
     	    	 authRejectCount = 1;
     	     }

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -672,7 +672,7 @@ public class UserFacade extends UserServiceImpl {
         QueryWrapper<UserAuthentication> qw = new QueryWrapper<>();
         qw.eq("user_id", userId).
                 eq("is_deleted", IsDeleteEnum.N.getKey());
-        UserAuthentication userAuthentication = userAuthenticationFacade.getOne(qw);
+        UserAuthentication userAuthentication = userAuthenticationFacade.getOne(qw, false);
 
         GetConsoleUserInfoDTO getConsoleUserInfoDTO = new GetConsoleUserInfoDTO();
         getConsoleUserInfoDTO.setUserName(user.getUsername());