病历获取

tran-service/src/main/java/com/diagbot/dto/InquiryTriageDTO.java

@@ -0,0 +1,50 @@
+package com.diagbot.dto;
+
+import com.diagbot.vo.SaveDisDeptVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020/3/25 14:32
+ */
+@Setter
+@Getter
+public class InquiryTriageDTO {
+    @ApiModelProperty(value = "医院名称")
+    private String hospitalCode;
+
+    @ApiModelProperty(value = "访问者的IP", hidden = true)
+    private String ip;
+
+    @Valid
+    @ApiModelProperty(value = "诊断结果和疾病科室", required = true)
+    private String disDept;
+
+    /*@ApiModelProperty(value = "姓名")
+    private String patName;*/
+
+    @ApiModelProperty(value = "年龄")
+    private Integer patAge;
+
+    @ApiModelProperty(value = "性别(1：男 2：女)")
+    private Integer patSex;
+
+    @ApiModelProperty(value = "对接类型(1：咨询，2：挂号)")
+    private Integer idType;
+
+/*    @ApiModelProperty(value = "证件号")
+    private String idNum;*/
+
+    @ApiModelProperty(value = "症状")
+    private String symptom;
+
+    @ApiModelProperty(value = "补充说明")
+    private String supplement;
+
+}

tran-service/src/main/java/com/diagbot/facade/InquiryTriageFacade.java

@@ -1,20 +1,26 @@
 package com.diagbot.facade;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.InquiryTriageDTO;
 import com.diagbot.dto.SaveInquiryTriageDTO;
 import com.diagbot.entity.Client;
 import com.diagbot.entity.InquiryTriage;
 import com.diagbot.entity.JSONResponseBean;
 import com.diagbot.entity.Request;
 import com.diagbot.entity.Response;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.InquiryTriageService;
 import com.diagbot.service.impl.InquiryTriageServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.FastJsonUtils;
 import com.diagbot.util.GsonUtil;
 import com.diagbot.util.HttpUtils;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.HospitalVO;
+import com.diagbot.vo.InquiryTriageMechVO;
 import com.diagbot.vo.SaveInquiryTriageVO;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
@@ -22,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import javax.swing.text.Utilities;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -89,6 +96,17 @@ public class InquiryTriageFacade extends InquiryTriageServiceImpl {
         return saveInquiryDTO;
     }
 
+    public List<InquiryTriageDTO> getInquirysByMech(InquiryTriageMechVO inquiryTriageMechVO) {
+        QueryWrapper<InquiryTriage> inquiryTriageQuery = new QueryWrapper<>();
+        inquiryTriageQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id_num", StringUtil.isNotBlank(inquiryTriageMechVO.getIdNum()));
+        List<InquiryTriage> data = list(inquiryTriageQuery);
+
+        List<InquiryTriageDTO> dataNew = new ArrayList<InquiryTriageDTO>();
+        //过滤
+        dataNew = BeanUtil.listCopyTo(data, InquiryTriageDTO.class);
+        return dataNew;
+    }
     private List<String> getUrl(SaveInquiryTriageVO saveInquiryVO) {
         //TODO 待定
         List<String> ret = Lists.newArrayList();
@@ -137,4 +155,6 @@ public class InquiryTriageFacade extends InquiryTriageServiceImpl {
         String method = "saveQuestionRecord";
         return new Request(serviceId, method, bodyList);
     }
+
+
 }

tran-service/src/main/java/com/diagbot/vo/InquiryTriageMechVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020/3/25 14:30
+ */
+@Setter
+@Getter
+public class InquiryTriageMechVO {
+    @ApiModelProperty(value = "证件号")
+    private String idNum;
+}

tran-service/src/main/java/com/diagbot/vo/SaveInquiryTriageVO.java

@@ -35,8 +35,8 @@ public class SaveInquiryTriageVO {
    @ApiModelProperty(value = "对接类型(1：咨询，2：挂号)")
     private Integer idType;
 
-/*    @ApiModelProperty(value = "证件号")
-    private String idNum;*/
+    @ApiModelProperty(value = "证件号")
+    private String idNum;
 
     @ApiModelProperty(value = "症状")
     private String symptom;

tran-service/src/main/java/com/diagbot/web/InquiryTriageController.java

@@ -2,19 +2,24 @@ package com.diagbot.web;
 
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.InquiryTriageDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SaveInquiryTriageDTO;
 import com.diagbot.facade.InquiryTriageFacade;
+import com.diagbot.vo.InquiryTriageMechVO;
 import com.diagbot.vo.SaveInquiryTriageVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * 智能分诊记录主表 前端控制器
@@ -32,7 +37,7 @@ public class InquiryTriageController {
     @Autowired
     private InquiryTriageFacade inquiryTriageFacade;
 
-    @ApiOperation(value = "分诊记录保存[by:gaodm]")
+    @ApiOperation(value = "分诊记录保存[by:wangfeng]")
     @PostMapping("/saveInquiry")
     @SysLogger("saveInquiry")
     @Transactional
@@ -41,12 +46,12 @@ public class InquiryTriageController {
         return RespDTO.onSuc(data);
     }
 
-    /*@ApiOperation(value = "获取机构下病人病历[by:gaodm]",
+    @ApiOperation(value = "根据门诊号获取机构下病人病历2期[by:wangfeng]",
             notes = "hospitalCode：医院名称<br>")
     @PostMapping("/getInquirysByMech")
     @SysLogger("getInquirysByMech")
-    public RespDTO<List<InquiryDTO>> getInquirysByMech(@RequestBody @Validated InquiryMechVO inquiryMechVO) {
-        return RespDTO.onSuc(inquiryInfoFacade.getInquirysByMech(inquiryMechVO));
-    }*/
+    public RespDTO<List<InquiryTriageDTO>> getInquirysByMech(@RequestBody @Validated InquiryTriageMechVO inquiryTriageMechVO) {
+        return RespDTO.onSuc(inquiryTriageFacade.getInquirysByMech(inquiryTriageMechVO));
+    }
 
 }