Merge branch 'dev/diagbotcloud20190918_vital' into dev/diagbotcloud20190924_diagnose2

admin-service/pom.xml

@@ -49,7 +49,7 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-server</artifactId>
-            <version>2.1.3</version>
+            <version>2.1.6</version>
         </dependency>
 
         <dependency>

aipt-service/src/main/java/com/diagbot/dto/ConceptDetailDTO.java

@@ -30,4 +30,9 @@ public class ConceptDetailDTO {
      * 是否诊断依据（1-是，0-否）
      */
     private Integer isReason;
-}
+
+    /**
+     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书，6-不良反应，7-症状描述信息(智能分诊)
+     */
+    private String position;
+}

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) {

common/pom.xml

@@ -23,21 +23,21 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.8.1</version>
+            <version>3.9</version>
             <!--<scope>provided</scope>-->
         </dependency>
 
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.6</version>
+            <version>1.18.10</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>5.1.6.RELEASE</version>
+            <version>5.1.9.RELEASE</version>
             <scope>provided</scope>
         </dependency>
 
@@ -51,21 +51,21 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
-            <version>5.1.4.RELEASE</version>
+            <version>5.1.6.RELEASE</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.security.oauth</groupId>
             <artifactId>spring-security-oauth2</artifactId>
-            <version>2.3.5.RELEASE</version>
+            <version>2.3.6.RELEASE</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.26</version>
+            <version>1.7.28</version>
             <scope>provided</scope>
         </dependency>
 
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.60</version>
+            <version>1.2.61</version>
             <scope>compile</scope>
         </dependency>
 
@@ -87,14 +87,14 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>4.0.1</version>
+            <version>4.1.0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>4.0.1</version>
+            <version>4.1.0</version>
             <scope>provided</scope>
         </dependency>
 

data-service/src/main/java/com/diagbot/dto/ConceptDetailDTO.java

@@ -30,4 +30,9 @@ public class ConceptDetailDTO {
      * 是否诊断依据（1-是，0-否）
      */
     private Integer isReason;
-}
+
+    /**
+     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书，6-不良反应，7-症状描述信息(智能分诊)
+     */
+    private String position;
+}

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);
     }
 }

docs/017.20190911知识库疾病科室分类维护/init_icss.sql

@@ -0,0 +1,7 @@
+-- ICSS 是否同时对接预问诊设置
+use `sys-tran`;
+INSERT INTO `sys-tran`.`tran_sys_set` (`hospital_code`, `plan`, `sys_type`, `name`, `code`, `value`, `remark`) VALUES ('A001', '0', '11', '是否同时对接预问诊', 'connect_prec', '1', '是否同时对接预问诊（0-不对接，1-对接）');
+
+use `sys-icss`;
+ALTER TABLE `icss_question_info`
+MODIFY COLUMN  `spec_flag` int(11) DEFAULT 0 COMMENT '特殊标记（0：没有标记，1：主诉高亮，2：诱因记录，3：推送可搜索，4：生命体征标记）';

docs/017.20190911知识库疾病科室分类维护/init_med.sql

@@ -0,0 +1,27 @@
+-- 知识库诊断设置科室和疾病分类
+use `med`;
+INSERT INTO `med`.`kl_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', 'Ⅰ', 'Ⅰ', '1', '1', '疾病分级-Ⅰ级');
+INSERT INTO `med`.`kl_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', 'Ⅱ', 'Ⅱ', '1', '2', '疾病分级-Ⅱ级');
+
+INSERT INTO kl_disease(concept_id)
+SELECT
+a.id
+FROM kl_concept a LEFT JOIN kl_disease b ON a.id=b.concept_id
+WHERE b.id IS NULL AND a.lib_type=18;
+
+UPDATE kl_disease a JOIN 
+(SELECT
+a.id,b.dept_id
+FROM kl_concept a JOIN kl_concept_common b ON a.id=b.concept_id
+WHERE a.lib_type=18 AND b.dept_id IS NOT NULL) b
+ON a.concept_id=b.id
+SET a.dept_id=b.dept_id;
+
+UPDATE  kl_disclaimer_information  SET STATUS = 0   WHERE disclaimer_code = 1 AND title = "1.诊断免责信息";
+ 
+UPDATE  kl_disclaimer_information  SET STATUS = 0   WHERE disclaimer_code = 2  AND title = "2.推送免责信息";
+
+INSERT INTO `kl_disclaimer_information`
+ (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `version_id`, `title`, `description`, `order_no`, `status`, `disclaimer_code`, `remark`) 
+ VALUES('N','2019-09-17 13:34:03','2019-09-17 13:34:03','1','1','0','1.诊疗推送（new）','以上诊疗推送仅供医生诊疗过程中参考使用，实际情况以医生临床诊断为准',NULL,'1','2',NULL);
+

docs/017.20190911知识库疾病科室分类维护/init_prec.sql

@@ -0,0 +1,7 @@
+-- 智能预问诊新增时间控件（待定）
+use `sys-prec`;
+ALTER TABLE `prec_question_info`
+MODIFY COLUMN `control_type` tinyint(4) NOT NULL DEFAULT 0 COMMENT '控件类型(0：无类型，默认值 1：单选 2：多选 3：多行输入，生命体征 4：上传图片 5：文本域，自行服药 6：文本框 7：数字文本框 8：多选伴无，9：时间带单位)';
+
+INSERT INTO `prec_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '时间带单位', '9', '1', '90', '单标签组件类型');
+

icss-service/src/main/java/com/diagbot/dto/ConceptDetailDTO.java

@@ -30,4 +30,9 @@ public class ConceptDetailDTO {
      * 是否诊断依据（1-是，0-否）
      */
     private Integer isReason;
-}
+
+    /**
+     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书，6-不良反应，7-症状描述信息(智能分诊)
+     */
+    private String position;
+}

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/PushFacade.java

@@ -114,6 +114,9 @@ public class PushFacade {
         String[] featureTypes = featureType.split(",|，");
         Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
 
+        //推理结果返回科室
+        pushDTO.setDept(data.getDept());
+
         //症状 概念+标签id
         if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Symptom.getKey()))) {
             List<ConceptPushDTO> symptom = data.getSymptom();

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/dto/GetConceptInfoDTO.java

@@ -51,4 +51,22 @@ public class GetConceptInfoDTO {
     @ApiModelProperty(value="症状发生的最大年龄")
     private Integer maxAge;
     
+    /**
+     * 术语类型
+     */
+    @ApiModelProperty(value="术语类型")
+    private String type;
+    
+    /**
+     * 科室概念id
+     */
+    @ApiModelProperty(value="科室概念id")
+    private Long deptId;
+
+    /**
+     * 诊断类型
+     */
+    @ApiModelProperty(value="诊断类型")
+    private String classify;
+    
 }

knowledgeman-service/src/main/java/com/diagbot/entity/Disease.java

@@ -0,0 +1,157 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * <p>
+ * 疾病表
+ * </p>
+ *
+ * @author gaodm
+ * @since 2019-09-16
+ */
+@TableName("kl_disease")
+public class Disease implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 术语概念id
+     */
+    private Long conceptId;
+
+    /**
+     * 科室概念id
+     */
+    private Long deptId;
+
+    private String classify;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public Long getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Long conceptId) {
+        this.conceptId = conceptId;
+    }
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+    public String getClassify() {
+        return classify;
+    }
+
+    public void setClassify(String classify) {
+        this.classify = classify;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "Disease{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", conceptId=" + conceptId +
+        ", deptId=" + deptId +
+        ", classify=" + classify +
+        ", remark=" + remark +
+        "}";
+    }
+}

knowledgeman-service/src/main/java/com/diagbot/enums/DiseaseClassifyEnum.java

@@ -0,0 +1,45 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+public enum DiseaseClassifyEnum implements KeyedNamed{
+	
+	LevelFirst(1, "Ⅰ"),
+	LevelSecond(2, "Ⅱ");
+	
+	@Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    DiseaseClassifyEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static DiseaseClassifyEnum getEnum(Integer key) {
+        for (DiseaseClassifyEnum item : DiseaseClassifyEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+    	DiseaseClassifyEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

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

@@ -16,11 +16,13 @@ import com.diagbot.dto.GetConceptInfoDetailDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.Concept;
 import com.diagbot.entity.ConceptCommon;
+import com.diagbot.entity.Disease;
 import com.diagbot.entity.Lexicon;
 import com.diagbot.entity.LibraryInfo;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.Relation;
 import com.diagbot.entity.wrapper.ConceptWrapper;
+import com.diagbot.enums.DiseaseClassifyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.LexiconRSTypeEnum;
 import com.diagbot.enums.LexiconTypeEnum;
@@ -28,6 +30,7 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.ConceptCommonService;
 import com.diagbot.service.ConceptService;
+import com.diagbot.service.DiseaseService;
 import com.diagbot.service.LibraryInfoService;
 import com.diagbot.service.impl.ConceptServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -108,6 +111,11 @@ public class ConceptFacade extends ConceptServiceImpl {
     @Autowired
     private ConceptCommonFacade conceptCommonFacade;
     @Autowired
+    private DiseaseFacade diseaseFacade;
+    @Autowired
+    @Qualifier("diseaseServiceImpl")
+    private DiseaseService diseaseService;
+    @Autowired
     private LisMappingFacade lisMappingFacade;
     @Autowired
     private ICSSManServiceClient icssManServiceClient;
@@ -434,12 +442,13 @@ public class ConceptFacade extends ConceptServiceImpl {
         getConceptInfoDTO.setLibName(getConceptInfoDetailDTOList.stream().filter(i -> i.getIsConcept() != null && i.getIsConcept() == 1).collect(Collectors.toList()));
         getConceptInfoDTO.setOtherNames(getConceptInfoDetailDTOList.stream().filter(i -> i.getIsConcept() == null || i.getIsConcept() == 0).collect(Collectors.toList()));
 
-        Integer isHasCommon = lexiconFacade.getById(concept.getLibType()).getIsHasCommon();
-        getConceptInfoDTO.setIsHasCommon(isHasCommon);
-        if (isHasCommon == 1) {
+        Lexicon lexicon = lexiconFacade.getById(concept.getLibType());
+        getConceptInfoDTO.setIsHasCommon(lexicon.getIsHasCommon());
+        getConceptInfoDTO.setType(lexicon.getName());
+        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());
@@ -447,6 +456,16 @@ 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, false);
+        	if(disease!=null){
+        		getConceptInfoDTO.setDeptId(disease.getDeptId());
+        		getConceptInfoDTO.setClassify(disease.getClassify());
+        	}
+        }
+
         return getConceptInfoDTO;
     }
 
@@ -489,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 + "数据有误，该类型信息在数据库中不存在！");
         }
@@ -613,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);
@@ -628,6 +647,32 @@ public class ConceptFacade extends ConceptServiceImpl {
             conceptCommonFacade.saveOrUpdate(conceptCommon);
         }
 
+        if(lexicon.getName().equals(LexiconTypeEnum.DIAGNOSIS.getName())){
+        	QueryWrapper<Disease> diseaseQe = new QueryWrapper<>();
+        	diseaseQe.eq("concept_id", conceptId);
+        	Disease disease = diseaseFacade.getOne(diseaseQe, false);
+        	if(disease==null){
+        		disease = new Disease();
+        		disease.setGmtCreate(now);
+        		disease.setCreator(currentUser);
+        	}
+        	disease.setConceptId(conceptId);
+        	disease.setGmtModified(now);
+        	disease.setModifier(currentUser);
+
+        	if(addConceptInfoVO.getAddCptDiseaseExtVO()==null){
+        		QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
+        		conceptQe.eq("lib_name", "全科");
+        		conceptQe.eq("lib_type", LexiconTypeEnum.DEPARTMENT.getKey());
+        		disease.setDeptId(getOne(conceptQe, false).getId());
+        		disease.setClassify(DiseaseClassifyEnum.LevelFirst.getName());
+        	}else{
+        		BeanUtil.copyProperties(addConceptInfoVO.getAddCptDiseaseExtVO(), disease);
+        	}
+
+        	diseaseFacade.saveOrUpdate(disease);
+        }
+
         return true;
     }
 
@@ -1032,6 +1077,31 @@ public class ConceptFacade extends ConceptServiceImpl {
         if (ListUtil.isNotEmpty(saveOrUpdateConceptCommonList)) {
             conceptCommonService.saveOrUpdateBatch(saveOrUpdateConceptCommonList);
         }
+
+        List<AddConceptInfoVO> disExtConList = addConceptInfoVOList.stream().filter(i->i.getConceptId()==null&&i.getType().equals(LexiconTypeEnum.DIAGNOSIS.getName())).collect(Collectors.toList());
+        if(ListUtil.isNotEmpty(disExtConList)){
+        	String currentUser = UserUtils.getCurrentPrincipleID();
+            Date now = DateUtil.now();
+
+            QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
+    		conceptQe.eq("lib_name", "全科");
+    		conceptQe.eq("lib_type", LexiconTypeEnum.DEPARTMENT.getKey());
+    		Concept deptConcept = getOne(conceptQe, false);
+
+            List<Disease> saveDiseaseList = Lists.newArrayList();
+            disExtConList.forEach(i->{
+            	Disease disease = new Disease();
+            	disease.setGmtCreate(now);
+            	disease.setCreator(currentUser);
+            	disease.setGmtModified(now);
+            	disease.setModifier(currentUser);
+            	disease.setConceptId(i.getConcept().getId());
+            	disease.setDeptId(deptConcept.getId());
+            	disease.setClassify("Ⅰ");
+            	saveDiseaseList.add(disease);
+            });
+        	diseaseService.saveBatch(saveDiseaseList);
+        }
     }
 
     @SuppressWarnings("deprecation")

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

@@ -244,7 +244,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);
@@ -750,7 +750,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/DiseaseFacade.java

@@ -0,0 +1,11 @@
+package com.diagbot.facade;
+
+import org.springframework.stereotype.Component;
+
+import com.diagbot.service.impl.DiseaseServiceImpl;
+
+@Component
+public class DiseaseFacade extends DiseaseServiceImpl {
+
+
+}

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

@@ -229,7 +229,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() + "】不存在");
         }
@@ -239,7 +239,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) {

knowledgeman-service/src/main/java/com/diagbot/mapper/DiseaseMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.Disease;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 疾病表 Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2019-09-16
+ */
+public interface DiseaseMapper extends BaseMapper<Disease> {
+
+}

knowledgeman-service/src/main/java/com/diagbot/service/DiseaseService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.Disease;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 疾病表 服务类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2019-09-16
+ */
+public interface DiseaseService extends IService<Disease> {
+
+}

knowledgeman-service/src/main/java/com/diagbot/service/impl/DiseaseServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.Disease;
+import com.diagbot.mapper.DiseaseMapper;
+import com.diagbot.service.DiseaseService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 疾病表 服务实现类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2019-09-16
+ */
+@Service
+public class DiseaseServiceImpl extends ServiceImpl<DiseaseMapper, Disease> implements DiseaseService {
+
+}

knowledgeman-service/src/main/java/com/diagbot/service/impl/EnumsDataServiceImpl.java

@@ -33,9 +33,12 @@ public class EnumsDataServiceImpl implements EnumsDataService {
     @Override
     public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData() {
         Map<String, List<EnumEntriesBuilder.Entry>> enumMap = new EnumEntriesBuilder()
-                .addEnums("disclaimerCodeEnum", DisclaimerCodeEnum.values())
+                .addEnums("disclaimerCodeAllEnum", DisclaimerCodeEnum.values())
+                .addEnums("disclaimerCodeEnum",
+                        DisclaimerCodeEnum.PushLiability, DisclaimerCodeEnum.Disclaimer)
                 .addEnums("positionTypeEnum", PositionTypeEnum.values())
-                .addEnums("lexiconRSTypeEnum", LexiconRSTypeEnum.INCLUDE_OF, LexiconRSTypeEnum.PUSH)
+                .addEnums("lexiconRSTypeEnum",
+                        LexiconRSTypeEnum.INCLUDE_OF, LexiconRSTypeEnum.PUSH)
                 .addEnums("lexiconTypeEnum", LexiconTypeEnum.values())
                 .addEnums("productTypeEnum", ProductTypeEnum.values())
                 .addEnums("concatLexiconTypeEnum",

knowledgeman-service/src/main/java/com/diagbot/vo/AddConceptInfoVO.java

@@ -51,6 +51,12 @@ public class AddConceptInfoVO {
 	@NotEmpty(message="术语明细不能为空")
 	private List<AddConceptInfoDetailVO> detailList;
 	
+	/**
+	 * 诊断类型术语扩展
+	 */
+	@ApiModelProperty(value="诊断类型术语扩展")
+	private AddCptDiseaseExtVO addCptDiseaseExtVO;
+	
 	/**
      * 性别：1:男, 2:女, 3:通用
      */

knowledgeman-service/src/main/java/com/diagbot/vo/AddCptDiseaseExtVO.java

@@ -0,0 +1,33 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rgb
+ * @time 2019-03
+ */
+@Getter
+@Setter
+public class AddCptDiseaseExtVO {
+	
+	/**
+     * 诊断归属科室id
+     */
+	@ApiModelProperty(value="诊断归属科室id",required=true)
+	@NotNull(message="诊断归属科室id必传")
+    private Long deptId;
+
+	/**
+	 * 诊断归属类型
+	 */
+	@ApiModelProperty(value="诊断归属类型",required=true)
+	@NotBlank(message="诊断归属类型必传")
+    private String classify;
+	
+}

knowledgeman-service/src/main/java/com/diagbot/web/ConceptController.java

@@ -137,7 +137,7 @@ public class ConceptController {
             notes = "type: 1:科室、2:辅检、3:慢病")
     @PostMapping("/getConceptListByType")
     @SysLogger("getConceptListByType")
-    @ApiIgnore
+//    @ApiIgnore
     public RespDTO<List<ConceptBaseDTO>> getConceptListByType(@RequestBody ConceptTypeVO conceptTypeVO) {
         return RespDTO.onSuc(conceptFacade.getConceptListByType(conceptTypeVO));
     }

knowledgeman-service/src/main/resources/mapper/DiseaseMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.DiseaseMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.Disease">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="concept_id" property="conceptId" />
+        <result column="dept_id" property="deptId" />
+        <result column="classify" property="classify" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

ltapi-service/src/main/java/com/diagbot/dto/ConceptDetailDTO.java

@@ -30,4 +30,9 @@ public class ConceptDetailDTO {
      * 是否诊断依据（1-是，0-否）
      */
     private Integer isReason;
-}
+
+    /**
+     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书，6-不良反应，7-症状描述信息(智能分诊)
+     */
+    private String position;
+}

pom.xml

@@ -37,7 +37,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.4.RELEASE</version>
+        <version>2.1.8.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -47,14 +47,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
-        <mybatis-plus-boot-starter.version>3.0.7.1</mybatis-plus-boot-starter.version>
-        <mybatis-spring-boot.version>2.0.0</mybatis-spring-boot.version>
-        <druid.version>1.1.16</druid.version>
+        <spring-cloud.version>Greenwich.SR3</spring-cloud.version>
+        <mybatis-plus-boot-starter.version>3.2.0</mybatis-plus-boot-starter.version>
+        <mybatis-spring-boot.version>2.1.0</mybatis-spring-boot.version>
+        <druid.version>1.1.20</druid.version>
         <swagger.version>2.9.2</swagger.version>
         <!--<swagger-bootstrap.version>1.9.1</swagger-bootstrap.version>-->
         <logstash.version>5.2</logstash.version>
-        <poi.version>4.0.1</poi.version>
+        <poi.version>4.1.0</poi.version>
         <docker-maven-plugin.version>1.1.1</docker-maven-plugin.version>
         <docker.image.prefix>192.168.2.236:5000/diagbotcloud</docker.image.prefix>
     </properties>

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<>();
@@ -214,12 +214,12 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         if (getInquiryDetailVO.getHospitalId() == null && StringUtil.isBlank(getInquiryDetailVO.getHospitalCode())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "医院信息(医院id或者医院编码)必传！");
         }
-        if (getInquiryDetailVO.getHospitalDeptId() == null && StringUtil.isBlank(getInquiryDetailVO.getHospitalDeptCode())) {
+        /*if (getInquiryDetailVO.getHospitalDeptId() == null && StringUtil.isBlank(getInquiryDetailVO.getHospitalDeptCode())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "科室信息(科室id或者科室编码)必传！");
         }
         if (getInquiryDetailVO.getDoctorId() == null && StringUtil.isBlank(getInquiryDetailVO.getDoctorCode())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "医生信息(医生id或者医生编码)必传！");
-        }
+        }*/
         if (getInquiryDetailVO.getPatientId() == null && StringUtil.isBlank(getInquiryDetailVO.getPatientCode()) && StringUtil.isBlank(getInquiryDetailVO.getPatientIdNo())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "患者信息(患者id或者患者编码或者患者病历号)必传！");
         }
@@ -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());