各个接口加入特殊标志，必填和详细阐述

docs/014.20190817预问诊邵逸夫对接新增/init_prec.sql

@@ -0,0 +1,10 @@
+use `sys-prec`;
+ALTER TABLE `prec_question_info`
+ADD COLUMN `spec_flag` int(11) NOT NULL DEFAULT '0' COMMENT '特殊标记（0：没有标记，1：拼接到主诉）' AFTER `url`;
+ALTER TABLE `prec_question_info`
+ADD COLUMN `required` int(11) NOT NULL DEFAULT '0' COMMENT '必填（0：不必填，1：必填）' AFTER `spec_flag`;
+ALTER TABLE `prec_question_info`
+ADD COLUMN `explains` TEXT COMMENT '详细阐述' AFTER `required`;
+ALTER TABLE `prec_question_info`
+MODIFY COLUMN  `control_type` tinyint(4) DEFAULT '0' COMMENT '控件类型(0：无类型，默认值 1：单选 2：多选 3：多行输入，生命体征 4：上传图片 5：文本域，自行服药 6：文本框 7：数字文本框 8：多选伴无)';
+INSERT INTO `prec_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '多选伴无', '8', '1', '80', '单标签组件类型');

prec-service/src/main/java/com/diagbot/dto/ConceptPushDTO.java

@@ -14,4 +14,10 @@ public class ConceptPushDTO extends ConceptBaseDTO {
     private Integer libType;  //词性
     private Long id;
     private Integer type;
+    //客户端界面描述
+    private String description;
+    //是否详细阐述
+    private Integer hasExplain = 0;
+    //详细阐述
+    private String explains;
 }

prec-service/src/main/java/com/diagbot/dto/QuestionDTO.java

@@ -27,6 +27,9 @@ public class QuestionDTO {
     private String labelSuffix = ""; //后置内容
     private String url;    //图片url地址
     private String description; // 客户端界面描述
+    private Integer specFlag;//特殊标记（0：没有标记，1：拼接到主诉）
+    private Integer required;//必填（0：不必填，1：必填）
+    private String explains;//详细阐述
     private Integer exclusionType; //互斥类型
     private List<QuestionDetail> questionDetailList = new ArrayList<>(); //标签明细表
     private List<QuestionDTO> questionMapping = new ArrayList<>();     //下级标签

prec-service/src/main/java/com/diagbot/dto/QuestionUsualDTO.java

@@ -14,4 +14,8 @@ public class QuestionUsualDTO extends ConceptBaseDTO{
     private Long questionId;
     //客户端界面描述
     private String description;
+    //是否详细阐述
+    private Integer hasExplain = 0;
+    //详细阐述
+    private String explains;
 }

prec-service/src/main/java/com/diagbot/dto/RetrievalDTO.java

@@ -29,4 +29,8 @@ public class RetrievalDTO {
     private Integer type;
     //客户端界面描述
     private String description;
+    //是否详细阐述
+    private Integer hasExplain = 0;
+    //详细阐述
+    private String explains;
 }

prec-service/src/main/java/com/diagbot/entity/QuestionInfo.java

@@ -92,6 +92,21 @@ public class QuestionInfo implements Serializable {
      */
     private String url;
 
+    /**
+     * 特殊标记（0：没有标记，1：拼接到主诉）
+     */
+    private Integer specFlag;
+
+    /**
+     * 必填（0：不必填，1：必填）
+     */
+    private Integer required;
+
+    /**
+     * 详细阐述
+     */
+    private String explains;
+
     /**
      * 备注
      */

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

@@ -12,6 +12,7 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.PushVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -83,6 +84,11 @@ public class PushFacade {
                 concept.setType(1);
                 if (questionInfoMap.containsKey(concept.getName())) {
                     concept.setId(questionInfoMap.get(concept.getName()).getId());
+                    concept.setDescription(questionInfoMap.get(concept.getName()).getDescription());
+                    if (StringUtil.isNotBlank(questionInfoMap.get(concept.getName()).getExplains())){
+                        concept.setHasExplain(1);
+                        concept.setExplains(questionInfoMap.get(concept.getName()).getExplains());
+                    }
                 }
             }
         }

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

@@ -11,6 +11,7 @@ import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.ConceptUsualVO;
 import com.diagbot.vo.QuestionUsualVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,6 +78,10 @@ public class QuestionUsualFacade {
                 if (null != questionInfoMap.get(questionUsualDTO.getName())) {
                     questionUsualDTO.setQuestionId(questionInfoMap.get(questionUsualDTO.getName()).getId());
                     questionUsualDTO.setDescription(questionInfoMap.get(questionUsualDTO.getName()).getDescription());
+                    if (StringUtil.isNotBlank(questionInfoMap.get(questionUsualDTO.getName()).getExplains())){
+                        questionUsualDTO.setHasExplain(1);
+                        questionUsualDTO.setExplains(questionInfoMap.get(questionUsualDTO.getName()).getExplains());
+                    }
                 }
             }
             //如何没有匹配到questionId就移除

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

@@ -72,6 +72,10 @@ public class RetrievalFacade {
                 if (null != questionInfoMap.get(conceptRetrievalDTO.getSelfName())) {//如果匹配到就添加questionId
                     retrievalDTO.setQuestionId(questionInfoMap.get(conceptRetrievalDTO.getSelfName()).getId());
                     retrievalDTO.setDescription(questionInfoMap.get(conceptRetrievalDTO.getSelfName()).getDescription());
+                    if (StringUtil.isNotBlank(questionInfoMap.get(conceptRetrievalDTO.getSelfName()).getExplains())){
+                        retrievalDTO.setHasExplain(1);
+                        retrievalDTO.setExplains(questionInfoMap.get(conceptRetrievalDTO.getSelfName()).getExplains());
+                    }
                 }
                 if (StringUtil.isNotEmpty(conceptRetrievalDTO.getSameName())) {//同义词
                     retrievalDTO.setRetrievalName(conceptRetrievalDTO.getSameName());

prec-service/src/main/resources/mapper/QuestionInfoMapper.xml

@@ -18,6 +18,9 @@
         <result column="label_prefix" property="labelPrefix" />
         <result column="label_suffix" property="labelSuffix" />
         <result column="url" property="url" />
+        <result column="spec_flag" property="specFlag" />
+        <result column="required" property="required" />
+        <result column="explains" property="explains" />
         <result column="remark" property="remark" />
     </resultMap>
 

prec-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "prec_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "prec_inquiry_info","prec_inquiry_evaluator" }); // 需要生成的表
+        strategy.setInclude(new String[] { "prec_question_info" }); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);