Merge branch 'develop' into dev/29290610_1.3.3

# Conflicts:
#	src/main/resources/mapper/BehospitalInfoMapper.xml

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -425,7 +425,10 @@
         AND a.behospital_code = b.behospital_code
         AND a.is_placefile = '1'
         -- AND ( b.age IS NULL OR b.age = '-' OR b.age = '' )
-        <![CDATA[AND ( b.newborn_month IS NOT NULL OR b.newborn_month <> '' OR b.newborn_month <> '0' OR b.newborn_day IS NOT NULL OR b.newborn_day <> '' OR b.newborn_day <> '0' )]]>
+        AND (
+        ( IFNULL( b.newborn_day, '' ) != '' AND b.newborn_day != '0' )
+        OR ( IFNULL( b.newborn_month, '' )!= '' AND b.newborn_month != '0' )
+        )
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}