分诊3期修改内容

tran-service/src/main/java/com/diagbot/entity/InquiryTriage.java

@@ -101,11 +101,20 @@ public class InquiryTriage implements Serializable {
      */
     private String disDept;
 
+    private String correlation;
     /**
      * 备注
      */
     private String remark;
 
+    public String getCorrelation() {
+        return correlation;
+    }
+
+    public void setCorrelation(String correlation) {
+        this.correlation = correlation;
+    }
+
     public Long getId() {
         return id;
     }

tran-service/src/main/java/com/diagbot/entity/OptInfo.java

@@ -76,6 +76,16 @@ public class OptInfo implements Serializable {
      */
     private String remark;
 
+    private Integer wayType;
+
+    public Integer getWayType() {
+        return wayType;
+    }
+
+    public void setWayType(Integer wayType) {
+        this.wayType = wayType;
+    }
+
     public Long getId() {
         return id;
     }

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

@@ -80,6 +80,7 @@ public class InquiryTriageFacade extends InquiryTriageServiceImpl {
         HospitalVO hospitalVO = new HospitalVO();
         hospitalVO.setHospitalCode(saveInquiryVO.getHospitalCode());
         hospitalVO.setSysType(saveInquiryVO.getSysType());
+        hospitalVO.setWayType(saveInquiryVO.getIdType());
         // 保存记录表
         optInfoFacade.saveOptOnfo(hospitalVO, "2");
         //邵逸夫医院 分诊对接纳里时，返回科室编码
@@ -207,6 +208,7 @@ public class InquiryTriageFacade extends InquiryTriageServiceImpl {
         body.put("patSex", saveInquiryVO.getPatSex());
         body.put("idType", saveInquiryVO.getIdType());
         body.put("symptom", saveInquiryVO.getSymptom());
+        body.put("correlation", saveInquiryVO.getCorrelation());
         body.put("supplement", saveInquiryVO.getSupplement());
 
         bodyList.add(body);

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

@@ -48,6 +48,7 @@ public class OptInfoFacade extends OptInfoServiceImpl {
         optInfo.setHospitalCode(StringUtil.isNotBlank(hospitalVO.getHospitalCode()) ? hospitalVO.getHospitalCode() : "朗通通用");
         optInfo.setOptType(optType);
         optInfo.setSysType(hospitalVO.getSysType());
+        optInfo.setWayType(hospitalVO.getWayType());
         Boolean res = this.save(optInfo);
         return res;
     }

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

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,4 +18,7 @@ public class HospitalVO {
      * 访问的系统类型 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web
      */
     private Integer sysType;
+
+    @ApiModelProperty(hidden = true)
+    private Integer wayType;
 }

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

@@ -36,4 +36,6 @@ public class OptHospPageVO extends Page {
      * 访问的系统类型 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web
      */
     private Integer sysType;
+
+    private Integer wayType;
 }

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

@@ -32,4 +32,6 @@ public class OptHospVO {
      * 访问的系统类型 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web
      */
     private Integer sysType;
+
+    private Integer wayType;
 }

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

@@ -32,4 +32,6 @@ public class OptVO {
     private Integer sysType;
     //医院名称列表
     private List<String> hospitalCodeList;
+
+    private Integer wayType;
 }

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

@@ -61,4 +61,7 @@ public class SaveInquiryTriageVO {
 
     @ApiModelProperty(value = "用户Id")
     private String mpiId;
+
+    @ApiModelProperty(value = "相关情况")
+    private String correlation;
 }

tran-service/src/main/resources/mapper/InquiryTriageMapper.xml

@@ -18,6 +18,7 @@
         <result column="id_type" property="idType" />
         <result column="id_num" property="idNum" />
         <result column="symptom" property="symptom" />
+        <result column="correlation" property="correlation" />
         <result column="supplement" property="supplement" />
         <result column="dis_dept" property="disDept" />
         <result column="remark" property="remark" />

tran-service/src/main/resources/mapper/OptInfoMapper.xml

@@ -14,6 +14,7 @@
         <result column="hospital_code" property="hospitalCode" />
         <result column="ip" property="ip" />
         <result column="opt_type" property="optType" />
+        <result column="way_type" property="wayType" />
         <result column="remark" property="remark" />
     </resultMap>
     <select id="getPV" parameterType="com.diagbot.vo.OptVO" resultType="com.diagbot.dto.PVDTO">
@@ -136,6 +137,9 @@
         tran_opt_info
         WHERE
         opt_type = 2
+        <if test="wayType != null and wayType != ''">
+            AND way_type = #{wayType}
+        </if>
         <if test="hospitalCode != null and hospitalCode != ''">
             AND hospital_code = #{hospitalCode}
         </if>
@@ -167,6 +171,9 @@
         tran_opt_info
         WHERE
         opt_type = 2
+        <if test="wayType != null and wayType != ''">
+            AND way_type = #{wayType}
+        </if>
         <if test="hospitalCode != null and hospitalCode != ''">
             AND hospital_code = #{hospitalCode}
         </if>
@@ -327,6 +334,9 @@
         tran_opt_info
         WHERE
         opt_type = 2
+        <if test="wayType != null and wayType != ''">
+            AND way_type = #{wayType}
+        </if>
         <if test="hospitalCode != null and hospitalCode != ''">
             AND hospital_code = #{hospitalCode}
         </if>
@@ -364,6 +374,9 @@
         tran_opt_info
         WHERE
         opt_type = 2
+        <if test="wayType != null and wayType != ''">
+            AND way_type = #{wayType}
+        </if>
         <if test="hospitalCode != null and hospitalCode != ''">
             AND hospital_code = #{hospitalCode}
         </if>
@@ -428,6 +441,9 @@
         tran_opt_info
         WHERE
         opt_type = 2
+        <if test="wayType != null and wayType != ''">
+            AND way_type = #{wayType}
+        </if>
         <if test="startDate!=null">
             AND gmt_create &gt;= #{startDate}
         </if>
@@ -523,6 +539,9 @@
                 tran_opt_info
                 WHERE
                 opt_type = 2
+                <if test="wayType != null and wayType != ''">
+                    AND way_type = #{wayType}
+                </if>
                 <if test="startDate!=null">
                     AND gmt_create &gt;= #{startDate}
                 </if>

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

@@ -61,4 +61,7 @@ public class SaveInquiryTriageVO {
 
     @ApiModelProperty(value = "用户Id")
     private String mpiId;
+
+    @ApiModelProperty(value = "相关情况")
+    private String correlation;
 }