Merge branch 'dev-1.1.4' into 'dev-1.1.4'

放射科发药问题修复

See merge request hurugang/thmz_system!28

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzPharmacyMapper.java

@@ -823,13 +823,13 @@ public interface MzPharmacyMapper {
             "#{doctorName}," +
             "a.drug_win ," +
             "a.input_id ," +
-            "a.input_time ," +
+            "a.input_date ," +
             "a.responce_type ," +
             "a.self_flag ," +
             "#{winNo}," +
             "#{groupNo}," +
             "a.warn_dept ," +
-            "#{inputTime}," +
+            "#{inputTime} as input_time," +
             "a.real_no, " +
             "a.manu_no " +
             " FROM " +