邵逸夫对接

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

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-zzcx?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-zzcxtzsl?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息

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

@@ -152,6 +152,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         if (saveInquiryVO.getDepartment().indexOf("全科") != -1) {
             body.put("diagnosis", saveInquiryVO.getDiagnosis());
         }
+        body.put("inquiryId", saveInquiryVO.getInquiryId());
         bodyList.add(body);
 
         //X-Service-Id对应的值

zzcx-service/src/main/java/com/diagbot/vo/GetInquiryCodeVO.java

@@ -1,10 +1,9 @@
-package com.diagbot.vo;
+package com.diagbot.dto;
 
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -13,17 +12,28 @@ import javax.validation.constraints.NotNull;
  */
 @Getter
 @Setter
-public class GetInquiryCodeVO {
+public class GetInquiryDTO {
 
     /**
      * 医院名称
      */
-    @NotBlank(message = "请输入医院名称")
     private String hospitalCode;
 
     /**
      * 诊序列号
      */
-    @NotBlank(message = "请输入就诊序列号")
     private String inquiryCode;
+
+    /**
+     * 姓名
+     */
+    private String patName;
+
+    /**
+     * 诊断
+     */
+    private String diagnosis;
+
+
+    private List<GetInquiryDetailDTO> inquiryDetailDTOS;
 }

zzcx-service/src/main/java/com/diagbot/dto/GetInquiryDetailDTO.java

@@ -0,0 +1,33 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.Option;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/2/28 15:46
+ */
+@Getter
+@Setter
+public class GetInquiryDetailDTO {
+
+    /**
+     * 问题
+     */
+    private String question;
+
+    /**
+     * 答案
+     */
+    private String answer;
+
+    /**
+     * 题目选项
+     */
+    private List<Option> options;
+
+}

zzcx-service/src/main/java/com/diagbot/entity/InquiryInfo.java

@@ -94,10 +94,10 @@ public class InquiryInfo implements Serializable {
     /**
      * 证件号
      */
-    private String 就诊序列号;
+    private String idNum;
 
     /**
-     * 证件号
+     * 就诊序列号
      */
     private String inquiryCode;
 

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

@@ -2,10 +2,13 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.GetInquiryDTO;
+import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.InquiryDTO;
 import com.diagbot.dto.InquiryPatDTO;
 import com.diagbot.entity.InquiryDetail;
 import com.diagbot.entity.InquiryInfo;
+import com.diagbot.entity.Option;
 import com.diagbot.enums.IdTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.InquiryDetailServiceImpl;
@@ -17,6 +20,7 @@ import com.diagbot.util.HttpUtils;
 import com.diagbot.util.IdCard;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
+import com.diagbot.vo.GetInquiryVO;
 import com.diagbot.vo.HospitalVO;
 import com.diagbot.vo.InquiryCodeVO;
 import com.diagbot.vo.InquiryDetailVO;
@@ -144,6 +148,40 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         return list;
     }
 
+    public GetInquiryDTO getInquiry(GetInquiryVO getInquiryVO) {
+        GetInquiryDTO getInquiryDTO = new GetInquiryDTO();
+
+        InquiryInfo inquiryInfo = this.getOne(new QueryWrapper<InquiryInfo>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_code", getInquiryVO.getHospitalCode())
+                .eq("inquiry_code", getInquiryVO.getInquiryCode()), false
+        );
+
+        if (null != inquiryInfo) {
+            BeanUtil.copyProperties(inquiryInfo, getInquiryDTO);
+            List<InquiryDetail> list = inquiryDetailFacade.list(new QueryWrapper<InquiryDetail>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("inquiry_id", inquiryInfo.getId())
+                    .orderByAsc("id")
+            );
+
+            List<GetInquiryDetailDTO> inquiryDetailDTOS = new ArrayList<>();
+            if (ListUtil.isNotEmpty(list)) {
+                for (InquiryDetail inquiryDetail : list) {
+                    GetInquiryDetailDTO getInquiryDetailDTO = new GetInquiryDetailDTO();
+                    BeanUtil.copyProperties(inquiryDetail, getInquiryDetailDTO);
+                    if (StringUtil.isNotBlank(inquiryDetail.getRemark())) {
+                        List<Option> options = GsonUtil.toList(inquiryDetail.getRemark(), Option.class);
+                        getInquiryDetailDTO.setOptions(options);
+                    }
+                    inquiryDetailDTOS.add(getInquiryDetailDTO);
+                }
+                getInquiryDTO.setInquiryDetailDTOS(inquiryDetailDTOS);
+            }
+        }
+        return getInquiryDTO;
+    }
+
     public Boolean upInquiryCode(InquiryCodeVO inquiryCodeVO) {
         Date now = DateUtil.now();
         return this.update(new UpdateWrapper<InquiryInfo>()

zzcx-service/src/main/java/com/diagbot/dto/GetInquiryCodeDTO.java

@@ -1,10 +1,8 @@
-package com.diagbot.dto;
+package com.diagbot.vo;
 
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * @Description:
  * @author: gaodm
@@ -12,7 +10,7 @@ import javax.validation.constraints.NotBlank;
  */
 @Getter
 @Setter
-public class GetInquiryCodeDTO {
+public class GetInquiryVO {
 
     /**
      * 医院名称

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

@@ -1,11 +1,13 @@
 package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.GetInquiryDTO;
 import com.diagbot.dto.InquiryDTO;
 import com.diagbot.dto.InquiryPatDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.InquiryDetail;
 import com.diagbot.facade.InquiryInfoFacade;
+import com.diagbot.vo.GetInquiryVO;
 import com.diagbot.vo.InquiryCodeVO;
 import com.diagbot.vo.InquiryDetailVO;
 import com.diagbot.vo.InquiryPatInquiryVO;
@@ -40,9 +42,9 @@ public class InquiryInfoController {
     @PostMapping("/saveInquiry")
     @SysLogger("saveInquiry")
     @Transactional
-    public RespDTO<Boolean> saveInquiry(@RequestBody SaveInquiryVO saveInquiryVO) {
-        inquiryInfoFacade.saveInquiry(saveInquiryVO);
-        return RespDTO.onSuc(true);
+    public RespDTO<Long> saveInquiry(@RequestBody SaveInquiryVO saveInquiryVO) {
+        Long inquiryId = inquiryInfoFacade.saveInquiry(saveInquiryVO);
+        return RespDTO.onSuc(inquiryId);
     }
 
 
@@ -93,4 +95,13 @@ public class InquiryInfoController {
     public RespDTO<Boolean> upInquiryCode(@RequestBody @Validated InquiryCodeVO inquiryCodeVO) {
         return RespDTO.onSuc(inquiryInfoFacade.upInquiryCode(inquiryCodeVO));
     }
+
+    @ApiOperation(value = "获取病历[by:gaodm]",
+            notes = "hospitalCode：医院名称<br>" +
+                    "inquiryCode：诊序列号<br>")
+    @PostMapping("/getInquiry")
+    @SysLogger("getInquiry")
+    public RespDTO<GetInquiryDTO> getInquiry(@RequestBody @Validated GetInquiryVO getInquiryVO) {
+        return RespDTO.onSuc(inquiryInfoFacade.getInquiry(getInquiryVO));
+    }
 }