诊断依据配置更改

config-server/src/main/resources/shared/knowledgeman-service-dev.yml

@@ -7,9 +7,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.235:3306/med-man?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: diagbot@20180822
+      password: lantone
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5

config-server/src/main/resources/shared/knowledgeman-service-local.yml

@@ -7,9 +7,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.235:3306/med-man?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: diagbot@20180822
+      password: lantone
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5

config-server/src/main/resources/shared/knowledgeman-service-test.yml

@@ -7,9 +7,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.235:3306/diagbot-med-test?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.241:3306/med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: diagbot@20180822
+      password: lantone
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5

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

@@ -71,47 +71,18 @@ public class DiagnoseQuestion implements Serializable {
     private Integer type;
 
     /**
-     * 编码
+     * 问题词名称
      */
-    private String code;
+    private String questionName;
 
     /**
-     * 标准词
+     * 问题词类型
      */
-    private String standard;
-
-    /**
-     * 关联词
-     */
-    private String relation;
-
-    /**
-     * 结果
-     */
-    private String result;
+    private Integer questionType;
 
     /**
      * 排序号
      */
     private Integer orderNo;
 
-    @Override
-    public String toString() {
-        return "DiagnoseQuestion{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", diagnoseId=" + diagnoseId +
-        ", disName=" + disName +
-        ", type=" + type +
-        ", code=" + code +
-        ", standard=" + standard +
-        ", relation=" + relation +
-        ", result=" + result +
-        ", orderNo=" + orderNo +
-        "}";
-    }
 }

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

@@ -0,0 +1,60 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * 
+ * @author zhoutg
+ * @Description:
+ * @date 2018年11月21日 下午2:31:42
+ */
+public enum DiagnoseFeatureTypeEnum implements KeyedNamed {
+
+    Symptom(1, "症状"),
+    Vital(1, "体征"),
+    Lis(1, "化验"),
+    Pacs(1, "辅检"),
+    Antidiastole(1, "鉴别诊断"),
+    History(1, "病史"),
+    Cause(1, "诱因"),
+    CourseOfDisease(1, "病程"),
+    Other(1, "其他");
+
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    DiagnoseFeatureTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static DiagnoseFeatureTypeEnum getEnum(Integer key) {
+        for (DiagnoseFeatureTypeEnum item : DiagnoseFeatureTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        DiagnoseFeatureTypeEnum 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/enums/DiagnoseTypeEnum.java

@@ -0,0 +1,54 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * 
+ * @author zhoutg
+ * @Description:
+ * @date 2018年11月21日 下午2:31:42
+ */
+public enum DiagnoseTypeEnum implements KeyedNamed {
+
+    Confirmed(91, "确诊"),
+    Examination(92, "拟诊"),
+    Vigilant(93, "警惕");
+
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    DiagnoseTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static DiagnoseTypeEnum getEnum(Integer key) {
+        for (DiagnoseTypeEnum item : DiagnoseTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        DiagnoseTypeEnum 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/DiagnoseFacade.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.ConceptBaseDTO;
+import com.diagbot.dto.DiagnoseDetailSaveDTO;
 import com.diagbot.dto.DiagnosePageDTO;
 import com.diagbot.entity.CommonParam;
 import com.diagbot.entity.Diagnose;
@@ -24,6 +25,7 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.vo.DeleteDiagnoseVO;
 import com.diagbot.vo.DiagnosePageVO;
 import com.diagbot.vo.DiseaseIndexVO;
+import com.diagbot.vo.GetDiagnoseDetailVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
@@ -43,6 +45,8 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
     @Autowired
     @Qualifier("diagnoseQuestionServiceImpl")
     DiagnoseQuestionService diagnoseQuestionService;
+    @Autowired
+    DiagnoseDetailFacade diagnoseDetailFacade;
 
     /**
      * 诊断依据分页
@@ -96,6 +100,25 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
     }
 
 
+    /**
+     * 诊断依据获取详情
+     *
+     * @param getDiagnoseDetailVO
+     * @return
+     */
+    public List<DiagnoseDetailSaveDTO> getDetail(GetDiagnoseDetailVO getDiagnoseDetailVO) {
+        List<DiagnoseDetail> detailList = diagnoseDetailFacade.list(new QueryWrapper<DiagnoseDetail>()
+                .eq("diagnose_id", getDiagnoseDetailVO.getId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .orderByAsc("order_no")
+        );
+        for (DiagnoseDetail detail : detailList) {
+        }
+
+        return null;
+    }
+
+
     /**
      * 诊断依据新增或修改
      *

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

@@ -0,0 +1,26 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 诊断依据表入参
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-08-08
+ */
+@Getter
+@Setter
+public class GetDiagnoseDetailVO implements Serializable {
+
+    @ApiModelProperty(value = "诊断依据主键")
+    @NotNull(message="诊断依据id不能为空")
+    private Long id;
+
+}

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

@@ -11,6 +11,7 @@ import com.diagbot.facade.DiagnoseFacade;
 import com.diagbot.vo.DeleteDiagnoseVO;
 import com.diagbot.vo.DiagnosePageVO;
 import com.diagbot.vo.DiseaseIndexVO;
+import com.diagbot.vo.GetDiagnoseDetailVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,4 +73,13 @@ public class DiagnoseController {
         diagnoseFacade.insertOrUpdate(diagnoseWrapper);
         return RespDTO.onSuc(true);
     }
+
+
+    @ApiOperation(value = "诊断依据-获取详情[by:zhoutg]")
+    @PostMapping("/getDetail")
+    @SysLogger("getDetail")
+    @Transactional
+    public RespDTO<Boolean> getDetail(@Valid @RequestBody GetDiagnoseDetailVO getDiagnoseDetailVO) {
+        return RespDTO.onSuc(true);
+    }
 }

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

@@ -13,10 +13,8 @@
         <result column="diagnose_id" property="diagnoseId" />
         <result column="dis_name" property="disName" />
         <result column="type" property="type" />
-        <result column="code" property="code" />
-        <result column="standard" property="standard" />
-        <result column="relation" property="relation" />
-        <result column="result" property="result" />
+        <result column="question_name" property="questionName" />
+        <result column="question_type" property="questionType" />
         <result column="order_no" property="orderNo" />
     </resultMap>