Merge branch 'develop_znwz_zzcx_xlcs' into 122run

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

@@ -104,12 +104,12 @@ io.github.lvyahui8.spring:
   base-packages: com.diagbot.aggregate
   thread-number: 12
 
-nali:
-  apiUrl: http://116.62.170.131:8096/openapi-devtest/gateway
-  appKey: ngari5e34e52511dc394f
-  appSecret: 11dc394fc05518c1
-
 #nali:
-#  apiUrl: https://ssltest.ngarihealth.com/openapi-prerelease/gateway
-#  appKey: ngari5e48d9ec11dc3978
-#  appSecret: 11dc397869c2d24a
+#  apiUrl: http://116.62.170.131:8096/openapi-devtest/gateway
+#  appKey: ngari5e34e52511dc394f
+#  appSecret: 11dc394fc05518c1
+
+nali:
+  apiUrl: https://ssltest.ngarihealth.com/openapi-prerelease/gateway
+  appKey: ngari5e48d9ec11dc3978
+  appSecret: 11dc397869c2d24a

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

@@ -22,6 +22,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.GetInquiryIdVO;
 import com.diagbot.vo.GetInquiryVO;
 import com.diagbot.vo.HospitalVO;
 import com.diagbot.vo.InquiryCodeVO;
@@ -191,6 +192,23 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         return getInquiryDTO;
     }
 
+
+    public Long getInquiryIdByIdnum(GetInquiryIdVO getInquiryIdVO) {
+        InquiryInfo inquiryInfo = this.getOne(new QueryWrapper<InquiryInfo>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_code", getInquiryIdVO.getHospitalCode())
+                .eq("source", getInquiryIdVO.getSource())
+                .eq("id_type", getInquiryIdVO.getIdType())
+                .eq("id_num", getInquiryIdVO.getIdNum())
+                .orderByDesc("gmt_modified"), false
+        );
+        if (inquiryInfo != null) {
+            return inquiryInfo.getId();
+        }
+        return null;
+    }
+
+
     public Boolean upInquiryCode(InquiryCodeVO inquiryCodeVO) {
         Date now = DateUtil.now();
         return this.update(new UpdateWrapper<InquiryInfo>()

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

@@ -0,0 +1,35 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: zhoutg
+ * @time: 2020/2/28 15:46
+ */
+@Getter
+@Setter
+public class GetInquiryIdVO {
+
+    /**
+     * 医院名称
+     */
+    @NotBlank(message = "请输入医院名称")
+    private String hospitalCode;
+
+    @NotBlank(message = "请输入厂商名称")
+    private String source;
+
+    @ApiModelProperty(value = "证件类型(1：身份证，2：护照，3：病历号)")
+    @NotNull(message = "请输入证件类型")
+    private Integer idType;
+
+    @ApiModelProperty(value = "证件号")
+    @NotBlank(message = "请输入病历号")
+    private String idNum;
+}

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

@@ -48,4 +48,7 @@ public class SaveInquiryVO {
 
     @ApiModelProperty(value = "诊断程度(1：高，2：中，3：低)")
     private Integer degree;
+
+    @ApiModelProperty(value = "厂商")
+    private String source;
 }

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

@@ -7,6 +7,7 @@ import com.diagbot.dto.InquiryPatDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.InquiryDetail;
 import com.diagbot.facade.InquiryInfoFacade;
+import com.diagbot.vo.GetInquiryIdVO;
 import com.diagbot.vo.GetInquiryVO;
 import com.diagbot.vo.InquiryCodeVO;
 import com.diagbot.vo.InquiryDetailVO;
@@ -22,6 +23,8 @@ 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 javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -103,4 +106,15 @@ public class InquiryInfoController {
     public RespDTO<GetInquiryDTO> getInquiry(@RequestBody @Validated GetInquiryVO getInquiryVO) {
         return RespDTO.onSuc(inquiryInfoFacade.getInquiry(getInquiryVO));
     }
+
+    @ApiOperation(value = "获取inquiryId[by:zhoutg]",
+            notes = "hospitalCode：医院名称<br>" +
+                    "source：厂商" +
+                    "idType：证件类型<br>" +
+                    "idNum")
+    @PostMapping("/getInquiryIdByIdnum")
+    @SysLogger("getInquiryIdByIdnum")
+    public RespDTO<Long> getInquiryIdByIdnum(@RequestBody @Valid GetInquiryIdVO getInquiryIdVO) {
+        return RespDTO.onSuc(inquiryInfoFacade.getInquiryIdByIdnum(getInquiryIdVO));
+    }
 }