Merge remote-tracking branch 'origin/dev/mix20191114_staticSearch' into dev/mix20191114_staticSearch

icssman-service/src/main/resources/mapper/QuestionInfoMapper.xml

@@ -112,13 +112,13 @@
         <if test="names != null and names.size() > 0">
             and UPPER(name) in
             <foreach  collection="names" item="name" open="("  separator=","  close=")">
-                UPPER(trim (#{name}))
+                UPPER(trim(#{name}))
             </foreach>
         </if>
         <if test="tagNames != null and tagNames.size() > 0">
             and UPPER(tag_name) in
             <foreach  collection="tagNames" item="tagName" open="("  separator=","  close=")">
-                UPPER(trim (#{tagName}))
+                UPPER(trim(#{tagName}))
             </foreach>
         </if>
         <if test="sexType != null and sexType != 3 and sexType != ''">
@@ -216,7 +216,7 @@
             AND a.type = #{type}
         </if>
         <if test="tagName != null and tagName != ''">
-            AND UPPER(a.tag_name) like concat ('%', UPPER(trim (#{tagName})), '%')
+            AND UPPER(a.tag_name) like concat ('%', UPPER(trim(#{tagName})), '%')
         </if>
         <if test="notTypeList != null and notTypeList.size() > 0 ">
             and a.type not in

knowledgeman-service/src/main/resources/mapper/DiagnoseMapper.xml

@@ -69,7 +69,7 @@
                 #{item}
             </foreach>
         </if>
-        AND (UPPER(a.NAME) = UPPER(trim (#{name})) OR UPPER(a.spell) = UPPER(trim (#{name})) )
+        AND (UPPER(a.NAME) = UPPER(trim(#{name})) OR UPPER(a.spell) = UPPER(trim(#{name})) )
 
         union
 

knowledgeman-service/src/main/resources/mapper/DisclaimerInformationMapper.xml

@@ -33,7 +33,7 @@
 		FROM kl_disclaimer_information
 		WHERE is_deleted = "N"
 		<if test="disAll.title != null">
-		and UPPER(title) like concat('%',UPPER(trim (#{disAll.title})),'%')
+		and UPPER(title) like concat('%',UPPER(trim(#{disAll.title})),'%')
 		</if>
 		ORDER BY gmt_create DESC
 	</select>

knowledgeman-service/src/main/resources/mapper/IndexConfigMapper.xml

@@ -30,7 +30,7 @@
 	WHERE b.is_deleted = 'N'
 	and a.disease_id = b.id
 	<if test="indexConfigVO.diseaseName != null">
-		AND UPPER(b.lib_name) LIKE CONCAT('%', UPPER(trim (#{indexConfigVO.diseaseName})), '%')
+		AND UPPER(b.lib_name) LIKE CONCAT('%', UPPER(trim(#{indexConfigVO.diseaseName})), '%')
 	</if>
 	GROUP BY a.disease_id
 	ORDER BY state ASC,gmtModified DESC
@@ -61,7 +61,7 @@
 	ON a.diseaseId = b.disease_id
 	WHERE b.disease_id IS NULL
 	<if test="diseaseNameVO.diseaseName != null and diseaseNameVO.diseaseName != ''">
-		AND UPPER(a.diseaseName) LIKE CONCAT('%', UPPER(trim (#{diseaseNameVO.diseaseName})), '%')
+		AND UPPER(a.diseaseName) LIKE CONCAT('%', UPPER(trim(#{diseaseNameVO.diseaseName})), '%')
 	</if>
 	ORDER BY a.diseaseName DESC
 </select>

knowledgeman-service/src/main/resources/mapper/LisMappingMapper.xml

@@ -114,19 +114,19 @@
         <if test="mealNames != null and mealNames.size() > 0 ">
             and UPPER(lis_mapping.meal_name) in
             <foreach  collection="mealNames" item="mealName" open="("  separator=","  close=")">
-                UPPER(trim (#{mealName}))
+                UPPER(trim(#{mealName}))
             </foreach>
         </if>
         <if test="itemNames != null and itemNames.size() > 0 ">
             and UPPER(item_con.lib_name) in
             <foreach  collection="itemNames" item="itemName" open="("  separator=","  close=")">
-                UPPER(trim (#{itemName}))
+                UPPER(trim(#{itemName}))
             </foreach>
         </if>
         <if test="uniqueNames != null and uniqueNames.size() > 0 ">
             and UPPER(lis_mapping.unique_name) in
             <foreach  collection="uniqueNames" item="uniqueName" open="("  separator=","  close=")">
-                UPPER(trim (#{uniqueName}))
+                UPPER(trim(#{uniqueName}))
             </foreach>
         </if>
     </select>

knowledgeman-service/src/main/resources/mapper/ScaleContentMapper.xml

@@ -17,7 +17,7 @@
             and UPPER(a.is_deleted) = UPPER(#{status})
         </if>
         <if test="name != null and name != ''">
-            and UPPER(b.lib_name) like concat('%',UPPER(#{name}) ,'%' )
+            and UPPER(b.lib_name) like concat('%',UPPER(trim(#{name})) ,'%' )
         </if>
         and b.lib_type = #{libType}
         ORDER BY a.is_deleted, a.gmt_modified desc
@@ -29,7 +29,7 @@
         where a.is_deleted = 'N'
         and a.lib_type = #{libType}
         <if test="name != null and name != ''">
-            and UPPER(a.lib_name) like concat('%',UPPER(#{name}) ,'%' )
+            and UPPER(a.lib_name) like concat('%',UPPER(trim(#{name})) ,'%' )
         </if>
         and not EXISTS(select 1 from kl_scale where a.id = concept_id)
         order by a.gmt_modified desc

knowledgeman-service/src/main/resources/mapper/VersionInfoMapper.xml

@@ -30,7 +30,7 @@
 	FROM kl_version_info u
 	WHERE u.is_deleted = 'N'
 	<if test="versionWrapperNameVO.name != null">
-		AND UPPER(u.name) LIKE CONCAT('%', UPPER(trim (#{versionWrapperNameVO.name})), '%')
+		AND UPPER(u.name) LIKE CONCAT('%', UPPER(trim(#{versionWrapperNameVO.name})), '%')
 	</if>
 	<if test="versionWrapperNameVO.productType != null and versionWrapperNameVO.productType != ''">
 		AND u.product_type = #{versionWrapperNameVO.productType}