Merge branch 'dev/20200713_1.3.7.3' into debug

doc/015.20200706v1.3.7.1/qc_initv1.3.7.1.sql

@@ -1,9 +1,9 @@
 use `qc`;
 
-ALTER TABLE `qc_cases_entry` ADD `drgs` tinyint(4) DEFAULT '1' COMMENT '是否控费(1：是，2：否)' AFTER `name`;
+ALTER TABLE `qc_cases_entry` ADD `drgs` tinyint(4) DEFAULT '2' COMMENT '是否控费(1：是，2：否)' AFTER `name`;
 ALTER TABLE `qc_cases_entry` ADD `type` tinyint(4) DEFAULT '1' COMMENT '质控形式(1：形式质控，2：内涵质控)' AFTER `drgs`;
 
 INSERT INTO `qc`.`sys_dictionary_info` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '17', '是', '1', '1', '1', '是否控费');
 INSERT INTO `qc`.`sys_dictionary_info` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '17', '否', '2', '1', '2', '是否控费');
-INSERT INTO `qc`.`sys_dictionary_info` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '18', '形式质控', '1', '1', '1', '质控形式');
-INSERT INTO `qc`.`sys_dictionary_info` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '18', '内涵质控', '2', '1', '2', '质控形式');
+INSERT INTO `qc`.`sys_dictionary_info` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '18', '形式质控', '1', '1', '2', '质控形式');
+INSERT INTO `qc`.`sys_dictionary_info` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '18', '内涵质控', '2', '1', '1', '质控形式');

src/main/resources/mapper/DoctorAdviceMapper.xml

@@ -61,8 +61,6 @@
         <if test="daStartDateEnd != null">
             <![CDATA[ and t.da_start_date < #{daStartDateEnd}]]>
         </if>
-        ORDER BY
-            da_start_date ASC
     </select>
 
     <update id="updateBatchByKey">