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

修复医嘱执行时间问题

See merge request lihong/thmz_system!71

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

@@ -8,7 +8,6 @@ import cn.hnthyy.thmz.entity.MzException;
 import cn.hnthyy.thmz.entity.his.yp.YpBaseYf;
 import cn.hnthyy.thmz.entity.his.yp.YpZdDict;
 import cn.hnthyy.thmz.entity.his.yz.YzYpPageNo;
-import cn.hnthyy.thmz.entity.his.yz.YzYpZyOrder;
 import cn.hnthyy.thmz.entity.his.zy.Prescription;
 import cn.hnthyy.thmz.entity.his.zy.YpZyPatient;
 import cn.hnthyy.thmz.entity.thmz.User;
@@ -305,10 +304,10 @@ public class YfWardPrescriptionController {
                 for (Date date : dates) {
                     int h = Integer.parseInt(DateUtil.pase(date, "yyyy-MM-dd HH:mm").toString().substring(11, 13));
                     Date d = DateUtil.pase(date, "yyyy-MM-dd");
-                    if(null == yfWardVo.getPerformanceTime()){
+                    if(null == yfWardVo.getOccTime()){
                         continue;
                     }
-                    Date performanceDate = DateUtil.pase(yfWardVo.getPerformanceTime(), "yyyy-MM-dd");
+                    Date performanceDate = DateUtil.pase(yfWardVo.getOccTime(), "yyyy-MM-dd");
                     if (h >= 12) {
                         if (h >= 13) {
                             if (d.getTime() == performanceDate.getTime()) {

src/main/resources/static/js/yf/ward_prescription.js

@@ -1503,8 +1503,8 @@ function printDetailHtml(dataArr, flag) {
             $(".kfmxtd").show();
             $(".yjmxtd").hide();
             $(".gyfs").hide();
-            if (minOccTime == '' || minOccTime > format(data.performanceTime, "yyyy-MM-dd HH:mm:ss")) {
-                minOccTime = format(data.performanceTime, "yyyy-MM-dd HH:mm:ss")
+            if (minOccTime === '' || minOccTime > format(data.occTime, "yyyy-MM-dd HH:mm:ss")) {
+                minOccTime = format(data.occTime, "yyyy-MM-dd HH:mm:ss")
             }
             html += '<td class="xtd" style="text-align: center;">' + data.frequCode + '</td>';
             html += '<td class="xtd" style="text-align: center;">' + data.dose + '</td>';
@@ -1532,9 +1532,9 @@ function printDetailHtml(dataArr, flag) {
     if (pageClass == "5" || pageClass == "6") {//口服单
         $(".kssj").show();
         $(".jssj").show();
-        var arr1 = minOccTime.split(" ");
-        var sdate = arr1[0].split('-');
-        var kssj = new Date(sdate[0], sdate[1] - 1, sdate[2]);
+        let arr1 = minOccTime.split(" ");
+        let sdate = arr1[0].split('-');
+        let kssj = new Date(sdate[0], sdate[1] - 1, sdate[2]);
         $(".kssj").text(format(kssj, "yy/MM/dd"));
         kssj.setTime(kssj.getTime() + 24 * 60 * 60 * 1000);
         $(".jssj").text(format(kssj, "yy/MM/dd"));