Merge remote-tracking branch 'origin/dev/diagbotcloud20190808_diagnose' into dev/diagbotcloud20190808_diagnose

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

@@ -1,4 +1,4 @@
-package com.diagbot.facade;
+package com.diagbot.dto;
 
 import java.util.List;
 

knowledgeman-service/src/main/java/com/diagbot/dto/DiagnoseQuestionPageDTO.java

@@ -14,104 +14,69 @@ import java.util.Date;
  * 诊断依据问题词表
  * </p>
  *
- * @author zhoutg
- * @since 2019-08-08
+ * @author wangfeng
+ * @since 2019-08-12
  */
-@TableName("kl_diagnose_question")
 @Getter
 @Setter
 public class DiagnoseQuestionPageDTO 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;
-
-    /**
-     * 创建人姓名
-     */
-    private String creator;
-
-    /**
-     * 修改人姓名
-     */
-    private String modifier;
-
-    /**
-     * 诊断依据表主键
-     */
-    private Long diagnoseId;
-
-    /**
-     * 诊断名称
-     */
-    private String disName;
-
-    /**
-     * 类型
-     */
-    private Integer type;
-
-    /**
-     * 编码
-     */
-    private String code;
-
-    /**
-     * 标准词
-     */
-    private String standard;
-
-    /**
-     * 关联词
-     */
-    private String relation;
-
-    /**
-     * 结果
-     */
-    private String result;
-
-    /**
-     * 排序号
-     */
-    private Integer orderNo;
-
-    @Override
-    public String toString() {
-        return "DiagnoseQuestionDTO{" +
-        "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 +
-        "}";
-    }
+	 private static final long serialVersionUID = 1L;
+
+	    /**
+	     * 主键
+	     */
+	    @TableId(value = "id", type = IdType.AUTO)
+	    private Long id;
+
+	    /**
+	     * 记录创建时间
+	     */
+	    private Date gmtCreate;
+
+	    /**
+	     * 记录修改时间,如果时间是1970年则表示纪录未修改
+	     */
+	    private Date gmtModified;
+
+	    /**
+	     * 创建人姓名
+	     */
+	    private String creator;
+
+	    /**
+	     * 修改人姓名
+	     */
+	    private String modifier;
+
+	    /**
+	     * 诊断依据表主键
+	     */
+	    private Long diagnoseId;
+
+	    /**
+	     * 诊断名称
+	     */
+	    private String disName;
+
+	    /**
+	     * 类型
+	     */
+	    private Integer type;
+
+	    /**
+	     * 问题词名称
+	     */
+	    private String questionName;
+
+	    /**
+	     * 问题词类型
+	     */
+	    private Integer questionType;
+
+	    /**
+	     * 排序号
+	     */
+	    private Integer orderNo;
+
 }

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

@@ -4,9 +4,7 @@ import java.io.InputStream;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -24,12 +22,13 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.DiagnoseImportDTO;
 import com.diagbot.dto.DiagnosticBasisExportDTO;
 import com.diagbot.dto.EquationDTO;
 import com.diagbot.dto.FeatureDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DiagnoseQuestion;
-import com.diagbot.enums.DiagnoseFieldEnum;
+import com.diagbot.enums.DiagnoseFeatureTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.TermEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -260,11 +259,11 @@ public class DiagnoseImportFacade {
 	 */
 	public String getType(Integer type, Integer questionType) {
 		String typeName = "";
-		if (type == 1) {
+		if (type == DiagnoseFeatureTypeEnum.Symptom.getKey()) {
 			typeName = TermEnum.getName(1);
-		} else if (type == 2) {
+		} else if (type == DiagnoseFeatureTypeEnum.Vital.getKey()) {
 			typeName = TermEnum.getName(2);
-		} else if (type == 3) {
+		} else if (type == DiagnoseFeatureTypeEnum.Lis.getKey()) {
 			if (questionType == 2) {
 				typeName = TermEnum.getName(3);
 			}
@@ -274,23 +273,22 @@ public class DiagnoseImportFacade {
 			if (questionType == 4) {
 				typeName = TermEnum.getName(5);
 			}
-
-		} else if (type == 4) {
+		} else if (type == DiagnoseFeatureTypeEnum.Pacs.getKey()) {
 			if (questionType == 2) {
 				typeName = TermEnum.getName(6);
 			}
 			if (questionType == 4) {
 				typeName = TermEnum.getName(7);
 			}
-		} else if (type == 5) {
+		} else if (type == DiagnoseFeatureTypeEnum.Antidiastole.getKey()) {
 			typeName = TermEnum.getName(8);
-		} else if (type == 6) {
+		} else if (type == DiagnoseFeatureTypeEnum.History.getKey()) {
 			typeName = TermEnum.getName(8);
-		} else if (type == 7) {
+		} else if (type == DiagnoseFeatureTypeEnum.Cause.getKey()) {
 			typeName = TermEnum.getName(9);
-		} else if (type == 8) {
+		} else if (type == DiagnoseFeatureTypeEnum.CourseOfDisease.getKey()) {
 			typeName = TermEnum.getName(10);
-		} else if (type == 9) {
+		} else if (type == DiagnoseFeatureTypeEnum.Other.getKey()) {
 			typeName = TermEnum.getName(10);
 		}
 

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

@@ -0,0 +1,35 @@
+package com.diagbot.facade;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.DiagnoseQuestionPageDTO;
+import com.diagbot.entity.DiagnoseQuestion;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.DiagnoseQuestionServiceImpl;
+import com.diagbot.vo.DiagnoseQuestionPageVO;
+
+@Component
+public class DiagnoseQuestionFacade  extends DiagnoseQuestionServiceImpl{
+	
+
+	/**
+	 * 
+	 * @param diagnoseQuestionPageVO
+	 * @return
+	 */
+	public IPage<DiagnoseQuestionPageDTO> queryQuestionPage(DiagnoseQuestionPageVO diagnoseQuestionPageVO) {
+		
+		QueryWrapper<DiagnoseQuestion> diaQuery = new QueryWrapper<>();
+		diaQuery.like("dis_name",diagnoseQuestionPageVO.getDisName()).like("question_name",diagnoseQuestionPageVO.getQuestionCode()).like("type",diagnoseQuestionPageVO.getType()).eq("is_deleted",IsDeleteEnum.N.getKey());
+		
+		IPage<DiagnoseQuestionPageDTO> datas = page(diagnoseQuestionPageVO, diaQuery);
+		
+		return datas;
+	}
+	
+
+}

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

@@ -1,10 +1,12 @@
 package com.diagbot.vo;
 
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import lombok.Getter;
 import lombok.Setter;
 
-import java.io.Serializable;
-
 /**
  * <p>
  * 诊断依据问题词表
@@ -15,7 +17,7 @@ import java.io.Serializable;
  */
 @Getter
 @Setter
-public class DiagnoseQuestionPageVO implements Serializable {
+public class DiagnoseQuestionPageVO extends Page implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -28,7 +28,7 @@ import io.swagger.annotations.ApiOperation;
  */
 @RestController
 @RequestMapping("/diagnose")
-@Api(value = "诊断依据导入API[by:wangfeng]", tags = { "WF——诊断依据导入API" })
+@Api(value = "知识库标准化-诊断依据导入API[by:wangfeng]", tags = { "知识库标准化-诊断依据导入API——WF" })
 @SuppressWarnings("unchecked")
 public class DiagnoseExportImportController {
 

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

@@ -1,8 +1,21 @@
 package com.diagbot.web;
 
-
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DiagnoseQuestionPageDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DiagnoseQuestionFacade;
+import com.diagbot.vo.DiagnoseQuestionPageVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
 /**
  * <p>
  * 诊断依据问题词表 前端控制器
@@ -13,6 +26,20 @@ import org.springframework.web.bind.annotation.RestController;
  */
 
 @RestController("/diagnoseQuestion")
+@Api(value = "知识库标准化-问题词数据维护相关API[by:wangfeng]", tags = { "知识库标准化-问题词数据维护相关API——WF" })
 public class DiagnoseQuestionController {
 
+	@Autowired
+	DiagnoseQuestionFacade diagnoseQuestionFacade;
+
+	@ApiOperation(value = "诊断依据问题词数据维护-分页查询[by:wangfeng]")
+	@PostMapping("/queryQuestionPage")
+	@SysLogger("queryQuestionPage")
+	@Transactional
+	public RespDTO<IPage<DiagnoseQuestionPageDTO>> queryQuestionPage(@RequestBody DiagnoseQuestionPageVO diagnoseQuestionPageVO) {
+
+		IPage<DiagnoseQuestionPageDTO> data = diagnoseQuestionFacade.queryQuestionPage(diagnoseQuestionPageVO);
+		return RespDTO.onSuc(data);
+	}
+
 }