Merge remote-tracking branch 'origin/master'

lis-interfaceCommon/src/main/resources/mapper/LabResultMedMapper.xml

@@ -80,9 +80,9 @@
         SELECT jyrq, yq, ybh,xmdh, xh, ywdh, mic,rad, csjg, jgbz, bz,txtresult
         FROM (
         <foreach collection="list" item="item" separator="UNION ALL">
-        SELECT #{item.jyrq}, #{item.yq}, #{item.ybh},
-                #{item.xmdh}, #{item.xh}, #{item.ywdh}, #{item.item.mic},
-                #{item.rad}, #{item.csjg}, #{item.jgbz}, #{item.bz},#{item.txtresult}
+        SELECT #{item.jyrq} as jyrq, #{item.yq} as yq, #{item.ybh} as ybh,
+                #{item.xmdh} as xmdh, #{item.xh} as xh, #{item.ywdh} as ywdh, #{item.mic} as mic,
+                #{item.rad} as rad, #{item.csjg} as csjg, #{item.jgbz} as jgbz, #{item.bz} as bz,#{item.txtresult} as txtresult
         </foreach>
         ) AS temp
     </insert>