From 63f83a91cdc47022e5fcd62385b2bd6dde2a2f18 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 15 Feb 2019 13:31:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mainOrm/master/PatientService.xml   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
index 53263b0..39a5fb2 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
@@ -26,6 +26,21 @@
         <result column="syn_status" property="synStatus" jdbcType="INTEGER"/>
         <result column="is_old" property="isOld" jdbcType="INTEGER"/>
         <result column="per_type" property="perType" jdbcType="INTEGER"/>
+
+        <result column="device" property="device" jdbcType="INTEGER"/>
+        <result column="deviceCon" property="deviceCon" jdbcType="INTEGER"/>
+        <result column="doctorWeek" property="doctorWeek" jdbcType="INTEGER"/>
+        <result column="serviceWeek" property="serviceWeek" jdbcType="INTEGER"/>
+
+        <result column="serStartWeek" property="serStartWeek" jdbcType="INTEGER"/>
+        <result column="serEndWeek" property="serEndWeek" jdbcType="INTEGER"/>
+
+        <result column="serStartTime" property="serStartTime" jdbcType="TIMESTAMP"/>
+        <result column="serEndTime" property="serEndTime" jdbcType="TIMESTAMP"/>
+        <result column="docStartWeek" property="docStartWeek" jdbcType="INTEGER"/>
+        <result column="docEndWeek" property="docEndWeek" jdbcType="INTEGER"/>
+        <result column="docStartTime" property="docStartTime" jdbcType="TIMESTAMP"/>
+        <result column="docEndTime" property="docEndTime" jdbcType="TIMESTAMP"/>
     </resultMap>
 
 
@@ -237,7 +252,8 @@
     <select id="queryPatientService" resultMap="PatientServiceResultMap"
             parameterType="com.lyms.platform.permission.model.PatientServiceQuery">
         select
-        id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id,syn_status,is_old,per_type
+        id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,
+        hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id,syn_status,is_old,per_type, device,deviceCon,doctorWeek,serviceWeek,serStartWeek,serEndWeek,serStartTime,serEndTime,docStartWeek,docEndWeek,docStartTime,docEndTime
         from patient_service
         <include refid="PatientServiceCondition"/>
         <include refid="orderAndLimit"/>
-- 
1.8.3.1