From 0f8efeddc84c5813005dfbc32930b4d68f11c5f9 Mon Sep 17 00:00:00 2001
From: zhizhi wu <2377881365@qq.com>
Date: Thu, 1 Apr 2021 23:44:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ocr=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tcm/src/main/resources/application-green.yml        | 4 ++--
 tcm/src/main/resources/mapper_dao/ReportCodeDao.xml | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tcm/src/main/resources/application-green.yml b/tcm/src/main/resources/application-green.yml
index 287cc757..8f683a2a 100644
--- a/tcm/src/main/resources/application-green.yml
+++ b/tcm/src/main/resources/application-green.yml
@@ -36,8 +36,8 @@ eureka:
     ip-address: 49.232.6.143
 file:
   path: /home/cloud/tcm/uploads/
-  domain: https://www.sxwikionline.com/gateway/tcm/
-  imgDomain: https://www.sxwikionline.com/gateway/tcm/uploads/
+  domain: http://sxzxyzzlm.tall.wiki/gateway/tcm/
+  imgDomain: http://sxzxyzzlm.tall.wiki/gateway/tcm/uploads/
 day:
   one: 9
   two: 30
diff --git a/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml b/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml
index c4d93f35..7d68c55b 100644
--- a/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml
+++ b/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml
@@ -96,12 +96,14 @@
         <result column="fSort" jdbcType="INTEGER" property="sort" />
         <result column="fRemark" jdbcType="VARCHAR" property="remark" />
         <result column="fReportType" jdbcType="TINYINT" property="reportType" />
+        <result column="fRecordType" jdbcType="TINYINT" property="recordType" />
         <collection property="subReportCodes" ofType="com.ccsens.tcm.bean.vo.QuestionVo$PatientCode">
             <id column="sId" jdbcType="BIGINT" property="id" />
             <result column="sCode" jdbcType="VARCHAR" property="code" />
             <result column="sName" jdbcType="VARCHAR" property="name" />
             <result column="sMust" jdbcType="TINYINT" property="must" />
             <result column="sSort" jdbcType="INTEGER" property="sort" />
+            <result column="sRecordType" jdbcType="TINYINT" property="recordType" />
             <result column="sRemark" jdbcType="VARCHAR" property="remark" />
             <result column="sReportType" jdbcType="TINYINT" property="reportType" />
         </collection>
@@ -116,14 +118,15 @@
         c1.sort as fSort,
         c1.remark as fRemark,
         c1.report_type as fReportType,
-        c1.record_type as recordType,
+        c1.record_type as fRecordType,
         c2.id as sId,
         c2.code as sCode,
         c2.`name` as sName,
         c2.must as sMust,
         c2.sort as sSort,
         c2.remark as sRemark,
-        c2.report_type as sReportType
+        c2.report_type as sReportType,
+        c2.record_type as sRecordType
         FROM
         t_report_code c1
         LEFT JOIN (