diff --git a/src/main/resources/com/hospital/front/mapper/nx/NxOrderMapper.xml b/src/main/resources/com/hospital/front/mapper/nx/NxOrderMapper.xml index 6d97b92..227678e 100644 --- a/src/main/resources/com/hospital/front/mapper/nx/NxOrderMapper.xml +++ b/src/main/resources/com/hospital/front/mapper/nx/NxOrderMapper.xml @@ -123,6 +123,9 @@ DEPARTMENT, ITEM_ASSEM_CODE, ITEM_ASSEM_NAME, + PE_DEPT_CODE, + PE_DEPT_NAME, + CONVERT ( VARCHAR ( 100 ), REGISTER_DATE, 20 ) REGISTER_DATE, (case when Finished_sign = '1' then N'完成' when Finished_sign != '1' then N'未完成' end) FINISHED_SIGN, CONVERT ( VARCHAR ( 100 ), PE_DATE, 20 ) PE_DATE from V_PHYEXAM_PE_PERSONAL_ITEM @@ -149,7 +152,7 @@ '' PE_VISIT_ID, PE_DEPT_CODE, PE_DEPT_NAME, - REPLACE(REPLACE(REPLACE(REPLACE(CONCLUSION_TEXT,CHAR(10),''), ' ', ''),char(9),''),char(13),'') CONCLUSION_TEXT + REPLACE(REPLACE(REPLACE(REPLACE(cast(CONCLUSION_TEXT as varchar(8000)),CHAR(10),''), ' ', ''),char(9),''),char(13),'') CONCLUSION_TEXT from V_PHYEXAM_DEPT_RESULT where PE_ID = #{peId} and CONCLUSION_TEXT is not null @@ -162,7 +165,7 @@ REPLACE( REPLACE( REPLACE( - REPLACE(REPLACE(GUIDE_CONTENT, CHAR(10), '<br/>'), ' ', ''), + REPLACE(REPLACE(CAST (GUIDE_CONTENT AS VARCHAR (8000)), CHAR(10), '<br/>'), ' ', ''), CHAR(9),'' ), CHAR(13), '' ), '<br/><br/>','<br/>'