Merge branch 'dev/icss' into debug

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

@@ -0,0 +1,61 @@
+package com.diagbot.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2018/11/19 18:56
+ */
+@ApiModel(value="历史病历列表接口出参")
+@Getter
+@Setter
+public class HisInquiryDTO{
+	
+	/**
+	 * 病历id
+	 */
+	@ApiModelProperty(value="病历id")
+	private Long id;
+	
+    /**
+     * 就诊序列号
+     */
+	@ApiModelProperty(value="就诊序列号")
+    private String inquiryCode;
+
+    /**
+     * 就诊状态（0待接诊，1接诊中，2完成接诊）
+     */
+	@ApiModelProperty(value="就诊状态（0待接诊，1接诊中，2完成接诊）")
+    private Integer regVisitedState;
+
+    /**
+     * 分类(1:门诊,2:住院)
+     */
+	@ApiModelProperty(value="分类(1:门诊,2:住院)")
+    private Integer type;
+
+    /**
+     * 诊断
+     */
+	@ApiModelProperty(value="诊断")
+    private String diagnose;
+
+    /**
+     * 类型：1：结构化 2：文本模式
+     */
+	@ApiModelProperty(value="类型：1：结构化 2：文本模式")
+    private Integer sign;
+
+    /**
+     * 内容JSON字符串
+     */
+	@ApiModelProperty(value="内容JSON字符串")
+    private String dataJson;
+	
+	
+}

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

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.HisInquiryDTO;
 import com.diagbot.dto.InquiryDetailDTO;
 import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.SaveInquiryDTO;
@@ -19,6 +20,7 @@ import com.diagbot.entity.InquiryInfo;
 import com.diagbot.entity.PatientInfo;
 import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.util.StringUtil;
+import com.diagbot.vo.HisInquirysVO;
 import com.diagbot.vo.ReadInquiryVO;
 import com.diagbot.vo.SaveInquiryVO;
 
@@ -122,5 +124,14 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 		
 		return readInquiryDTO;
 	}
+	
+	/**
+	 * 历史病历列表
+	 * @param hisInquirysVO
+	 * @return
+	 */
+	public List<HisInquiryDTO> hisInquirys(HisInquirysVO hisInquirysVO){
+		return null;
+	}
 
 }

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

@@ -119,7 +119,20 @@ public class PushFacade {
             pushDTO.setLabMap(labMap);
         } else if (featureTypeSet.contains(QuestionTypeEnum.Pacs.getKey())) {
             pushDTO.setPacsMap(pacsMap);
-        } else if (featureTypeSet.contains(QuestionTypeEnum.Disease.getKey())) {
+        }
+        //诊断 返回tagName+id
+        else if (featureTypeSet.contains(QuestionTypeEnum.Disease.getKey())) {
+            QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper();
+            questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                    in("tag_name", disMap.keySet()).
+                    eq("type", QuestionTypeEnum.Disease.getKey());
+            List<QuestionInfo> disList = questionFacade.list(questionInfoQueryWrapper);
+            Map<String, QuestionInfo> questionInfoMap = EntityUtil.makeEntityMap(disList, "tagName");
+            for (Map.Entry<String, Object> entry : disMap.entrySet()) {
+                if (questionInfoMap.get(entry.getKey()) != null) {
+                    entry.setValue(questionInfoMap.get(entry.getKey()).getId());
+                }
+            }
             pushDTO.setDisMap(disMap);
         }
         //症状(主诉 type=1;现病史 type=2) 返回 tagName+填写单

icss-service/src/main/java/com/diagbot/mapper/HospitalInfoMapper.java

@@ -1,12 +1,12 @@
 package com.diagbot.mapper;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.entity.HospitalInfo;
 import com.diagbot.vo.HospitalInfoVO;
 
-import java.util.List;
-
 /**
  * <p>
  * 医院信息表 Mapper 接口
@@ -23,5 +23,8 @@ public interface HospitalInfoMapper extends BaseMapper<HospitalInfo> {
      * @param hospitalInfoVO
      * @return
      */
-    public List<HospitalInfoDTO> getHospitalInfos(HospitalInfoVO hospitalInfoVO);
+    List<HospitalInfoDTO> getHospitalInfos(HospitalInfoVO hospitalInfoVO);
+    
+    
+    
 }

icss-service/src/main/java/com/diagbot/vo/HisInquirysVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2018/11/19 18:58
+ */
+@ApiModel(value="历史病历列表接口传参")
+@Getter
+@Setter
+public class HisInquirysVO {
+	
+	   
+}

icss-service/src/main/java/com/diagbot/web/InquiryInfoController.java

@@ -1,6 +1,8 @@
 package com.diagbot.web;
 
 
+import java.util.List;
+
 import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,10 +13,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.HisInquiryDTO;
 import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SaveInquiryDTO;
 import com.diagbot.facade.InquiryInfoFacade;
+import com.diagbot.vo.HisInquirysVO;
 import com.diagbot.vo.ReadInquiryVO;
 import com.diagbot.vo.SaveInquiryVO;
 
@@ -49,6 +53,13 @@ public class InquiryInfoController {
 		return RespDTO.onSuc(inquiryInfoFacade.readInquiry(readInquiryVO));
 	}
     
+    @ApiOperation(value = "历史病历列表[by:rengb]")
+   	@PostMapping("/hisInquirys")
+   	@SysLogger("hisInquirys")
+   	public RespDTO<List<HisInquiryDTO>> hisInquirys(@Valid @RequestBody HisInquirysVO hisInquirysVO) {
+   		return RespDTO.onSuc(inquiryInfoFacade.hisInquirys(hisInquirysVO));
+   	}
+    
     
     
 }

icss-service/src/main/java/com/diagbot/web/ModuleQuestionController.java

@@ -1,20 +0,0 @@
-package com.diagbot.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 模型标签映射表 前端控制器
- * </p>
- *
- * @author zhoutg
- * @since 2018-11-15
- */
-@Controller
-@RequestMapping("/moduleQuestion")
-public class ModuleQuestionController {
-
-}

icss-service/src/main/java/com/diagbot/web/PushController.java

@@ -35,8 +35,8 @@ public class PushController {
     @ApiOperation(value = "推理接口[by:zhaops]",
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别，1：男，2：女(必填)<br>")
-    @PostMapping("/push_inner")
-    @SysLogger("push_inner")
+    @PostMapping("/pushInner")
+    @SysLogger("pushInner")
     public RespDTO<PushDTO> pushInner(@RequestBody @Valid PushVO pushVO) {
         return RespDTO.onSuc(pushFacade.pushInner(pushVO));
     }

icss-service/src/main/java/com/diagbot/web/QuestionDetailController.java

@@ -1,20 +0,0 @@
-package com.diagbot.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 标签明细表 前端控制器
- * </p>
- *
- * @author zhoutg
- * @since 2018-11-15
- */
-@Controller
-@RequestMapping("/questionDetail")
-public class QuestionDetailController {
-
-}

icss-service/src/main/java/com/diagbot/web/QuestionMappingController.java

@@ -1,20 +0,0 @@
-package com.diagbot.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 标签映射表 前端控制器
- * </p>
- *
- * @author zhoutg
- * @since 2018-11-15
- */
-@Controller
-@RequestMapping("/questionMapping")
-public class QuestionMappingController {
-
-}

icss-service/src/main/java/com/diagbot/web/QuestionRelationController.java

@@ -1,20 +0,0 @@
-package com.diagbot.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 标签关联表（同级关联） 前端控制器
- * </p>
- *
- * @author zhoutg
- * @since 2018-11-15
- */
-@Controller
-@RequestMapping("/questionRelation")
-public class QuestionRelationController {
-
-}

icss-service/src/main/java/com/diagbot/web/RetrievalMappingController.java

@@ -1,19 +0,0 @@
-package com.diagbot.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 检索映射表 前端控制器
- * </p>
- *
- * @author wangyu
- * @since 2018-11-16
- */
-@RestController
-@RequestMapping("/retrievalMapping")
-public class RetrievalMappingController {
-
-}