Merge remote-tracking branch 'origin/dev/29290610_1.3.3' into debug

doc/008.20200610v1.3.3/qc_initv1.3.3.sql

@@ -1,3 +1,5 @@
 use `qc`;
 
 ALTER TABLE `med_behospital_info` ADD `placefile_date` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '归档时间' AFTER `is_placefile`;
+
+INSERT INTO `sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('290', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', 'leaveHospitalType', '出院情况', '2', '0', '病案首页诊断信息');

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -425,7 +425,7 @@
         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_day IS NOT NULL OR b.newborn_day <> '' )]]>
+        <![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' )]]>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}