Merge branch 'develop' into dev/prec20191023_iq

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

@@ -134,7 +134,7 @@
 
      <select id="getUniqueName" resultType="com.diagbot.vo.LisMappingSearch">
         select * from (
-            SELECT b1.lib_name meal_name, lib1.name tc, IFNULL(b2.lib_name,'') item_name, IFNULL(lib2.name,'') mx, b3.lib_name unique_name
+            SELECT b1.lib_name meal_name, lib1.name tc, IFNULL(b2.lib_name,'') item_name, IFNULL(lib2.name,'') mx, IFNULL(b3.lib_name,'') unique_name
             FROM `kl_lis_mapping` a
             LEFT JOIN kl_concept b1 on a.meal_id = b1.id and b1.is_deleted = 'N'
             LEFT JOIN kl_library_info lib1 on b1.id = lib1.concept_id and lib1.is_deleted = 'N'
@@ -151,7 +151,7 @@
 
     <select id="loadLisMapping" resultType="java.lang.String">
         select concat(tc, '__',mx, '__', unique_name) from (
-        SELECT b1.lib_name meal_name, lib1.name tc, IFNULL(b2.lib_name,'') item_name, IFNULL(lib2.name,'') mx, b3.lib_name unique_name
+        SELECT b1.lib_name meal_name, lib1.name tc, IFNULL(b2.lib_name,'') item_name, IFNULL(lib2.name,'') mx, IFNULL(b3.lib_name,'') unique_name
         FROM `kl_lis_mapping` a
         LEFT JOIN kl_concept b1 on a.meal_id = b1.id and b1.is_deleted = 'N'
         LEFT JOIN kl_library_info lib1 on lib1.concept_id = b1.id and lib1.is_deleted = 'N'