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

医嘱时间FYI

See merge request lihong/thmz_system!72

src/main/java/cn/hnthyy/thmz/controller/yf/YfWardPrescriptionController.java

@@ -307,7 +307,7 @@ public class YfWardPrescriptionController {
                     if(null == yfWardVo.getOccTime()){
                         continue;
                     }
-                    Date performanceDate = DateUtil.pase(yfWardVo.getOccTime(), "yyyy-MM-dd");
+                    Date performanceDate = DateUtil.pase(yfWardVo.getPerformanceTime(), "yyyy-MM-dd");
                     if (h >= 12) {
                         if (h >= 13) {
                             if (d.getTime() == performanceDate.getTime()) {