Merge remote-tracking branch 'origin/develop' into zhaoyun

healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml

@@ -136,6 +136,7 @@
                T1.diagnosis_time AS diagnosisTime,
                T1.doctor AS diagnosisDoctor,
                T1.long_term_flag AS longTermFlag,
+               T1.classification,
                CASE WHEN EXISTS (
                    SELECT 1 FROM infectious_card T4
                    WHERE T4.diag_id = T2.id AND T4.delete_flag = '0' AND T4.status >= 1
@@ -174,5 +175,4 @@
              ) AS counts
     </select>
 
-</mapper>
-               T1.classification,
+</mapper>