住院发药优化

src/main/java/cn/hnthyy/thmz/service/his/yf/YfWardPrescriptionService.java

@@ -45,7 +45,7 @@ public interface YfWardPrescriptionService {
      * @param pageClass
      * @return
      */
-    String queryYzYpPageNoStr(String groupNo, String wardCode, String pageClass);
+    String queryYzYpPageNoStr(String groupNo, String wardCode, String pageClass) throws MzException;
 
     /**
      * 查询药品请领单汇总（医技科室领药单）

src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfWardPrescriptionServiceImpl.java

@@ -198,10 +198,15 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
     }
 
     @Override
-    public String queryYzYpPageNoStr(String groupNo, String wardCode, String pageClass) {
+    public String queryYzYpPageNoStr(String groupNo, String wardCode, String pageClass) throws MzException {
         String reslutStr = "";
         String[] strings = yzYpPageNoMapper.selectYzYpPageNos(groupNo, wardCode, pageClass);
         for (int i = 0; i < strings.length; i++) {
+            // 查询是否存在已发药的药单
+            List<YzYpZyOrder> yzYpZyOrders = ypZyPatientMapper.selectYpZyPatientFyDetail(strings[i]);
+            if(yzYpZyOrders.size() > 0){
+                throw new MzException("存在已发药的药单，请检查！");
+            }
             if (i == 0) {
                 reslutStr = strings[i];
             } else {

src/main/resources/static/js/mz/pharmacy-cell.js

@@ -3,7 +3,6 @@
 var fullscreen = false;//浏览器全屏状态
 //药房编号
 var groupNo = 71;
-var timeInterval;
 $(function () {
     openSocket("PD");
     this.onkeydown = function (e) { // 监听键盘事件
@@ -53,11 +52,14 @@ $(function () {
     $(".selectpicker").selectpicker({
         dropuAuto: false
     });
-    //进入页面就加载一次
-    CurentTime();
+
     fullScreen('fulldiv');
-    //每秒获取当前时间
-    timeInterval = setInterval(CurentTime, 1000);
+
+    //调用函数，执行一次
+    currentTime();
+    //调用setInterval函数，实现始终计时
+    setInterval(currentTime, 1000);
+
     setHeightForTable();
 
     $(window).resize(function () {
@@ -140,45 +142,34 @@ function siReadCard(bizType) {
  */
 function setHeightForTable() {
     var height = $(window).height() - 320;
-    var realHeigt = height / 7;
-    if (realHeigt < 75) {
-        realHeigt = 75;
+    var realHeight = height / 7;
+    if (realHeight < 75) {
+        realHeight = 75;
     }
-    $("#tableList tr").css("height", realHeigt + "px");
+    $("#tableList tr").css("height", realHeight + "px");
 }
 
+function currentTime(){
+    //获取时间保存到date变量
+    var date = new Date();
+
+    //将星期日~星期一保存到数组
+    var week = ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'];
+    //获取date中的小时，如果小于9，则在前面拼接一个0
+    var hours = date.getHours()>9?date.getHours():'0'+date.getHours();
+    //获取date中的分钟，如果小于9，则在前面拼接一个0
+    var minutes = date.getMinutes()>9?date.getMinutes():'0'+date.getMinutes();
+    //获取date中的秒，如果小于9，则在前面拼接一个0
+    var seconds = date.getSeconds()>9?date.getSeconds():'0'+date.getSeconds();
+
+    //获取date中的年、月、日, 拼接星期
+    var dates = date.getFullYear()+'年'+(date.getMonth()+1)+'月'+date.getDate()+'日 '+week[date.getDay()];
+    //拼接时分秒
+    var times = hours+':'+minutes+':'+seconds;
+
+    //向dateNow节点添加dates(年、月、日, 星期)
+    $("#dateNow").html(dates);
+    //向timeNow节点添加timess(时、分、秒)
+    $("#timeNow").html(times);
 
-/**
- * 取当前时间 格式 yyyy年mm月dd日 hh:mm:ss weekday
- * @constructor
- */
-function CurentTime() {
-    let now = new Date();
-    let year = now.getFullYear();     //年
-    let month = now.getMonth() + 1;     //月
-    let day = now.getDate();            //日
-    let hh = now.getHours();            //时
-    let mm = now.getMinutes();          //分
-    let s = now.getSeconds();          //分
-    let weekday = new Array(7);			//周
-    weekday[0] = "星期日";
-    weekday[1] = "星期一";
-    weekday[2] = "星期二";
-    weekday[3] = "星期三";
-    weekday[4] = "星期四";
-    weekday[5] = "星期五";
-    weekday[6] = "星期六";
-    let date = year + "/" + month + "/";
-    if (day < 10) date += "0";
-    date += day;
-    date += "  " + weekday[now.getDay()];
-    $("#dateNow").html(date);
-    let time = "";
-    if (hh < 10) time += "0";
-    time += hh + ":";
-    if (mm < 10) time += '0';
-    time += mm + ":";
-    if (s < 10) time += '0';
-    time += s;
-    $("#timeNow").html(time)
 }

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

@@ -1620,8 +1620,7 @@ function printLabelLongTime(datas, isMx, LODOP) {
         for (let j = 0; j < tableDatas.length; j++) {
             if (tableDatas[j].fybz.indexOf("发药") != -1 && tableDatas[j].chargeCode == data.chargeCode
                 && tableDatas[j].serial == data.serial && (tableDatas[j].occTime == data.occTime || isMx == 0)) {
-                if ((i > 0 && (data.inpatientNo != datas[i - 1].inpatientNo
-                    || data.occTime != datas[i - 1].occTime)) || number == 5) {//服药时间或者病人不同另起一页，超过五种药品另起一页
+                if ((i > 0 && (data.inpatientNo != datas[i - 1].inpatientNo || data.occTime != datas[i - 1].occTime)) || number == 5) {//服药时间或者病人不同另起一页，超过五种药品另起一页
                     if (html != '') {
                         for (let j = 0; j < 5 - number; j++) {
                             html += '<tr class="sjh">';
@@ -1643,8 +1642,9 @@ function printLabelLongTime(datas, isMx, LODOP) {
                 }
                 if (flag) {
                     $('.sjh').remove();
-                    let w_code = $("#wardCode").find("option:selected").text();
-                    $(".wardName").text(w_code.substring(0, w_code.lastIndexOf("(")));
+                    //let w_code = $("#wardCode").find("option:selected").text();
+                    //$(".wardName").text(w_code.substring(0, w_code.lastIndexOf("(")));
+                    $(".wardName").text($.trim(data.wardName));
                     $(".inpatientNo").text($.trim(data.inpatientNo));
                     $(".bedNo").text($.trim(data.bedNo));
                     $(".name").text($.trim(data.name));

src/main/resources/templates/mz/pharmacy-cell.html

@@ -58,7 +58,7 @@
                 </div>
                 <div class="col-md-9 col-sm-9 col-xs-12" style="border-bottom: 6px solid #8ADCA3;height: 100px;padding-top: 10px;">
                     <div class="col-md-6 col-sm-6 col-xs-12">
-                        <h1 class="title">发药排队&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h1></div>
+                        <h1 class="title">&nbsp;&nbsp;&nbsp;发药排队&nbsp;&nbsp;&nbsp;</h1></div>
                     <div class="col-md-6 col-sm-6 col-xs-12">
                         <div style="text-align: right;padding-right: 50px;font-family: fantasy;">
                             <span style="font-size: 32px;" id="timeNow"></span><br>
@@ -68,11 +68,11 @@
                 </div>
                 <div style="margin-top: 280px;">
                     <button type="button" id="btn_med_in_cert" class="btn btn-primary button-click"
-                            style="background: url('/thmz/images/ybpz.png')no-repeat;margin-right: 100px;"
+                            style="background: url('/thmz/images/ybpz.png')no-repeat;margin-right: 100px;cursor:pointer"
                             title="医保凭证">
                     </button>
                     <button type="button" id="btn_patient_id" class="btn btn-primary button-click"
-                            style="background: url('/thmz/images/jfpz.png')no-repeat;margin-left: 100px;"
+                            style="background: url('/thmz/images/jfpz.png')no-repeat;margin-left: 100px;cursor:pointer"
                             title="缴费凭证">
                     </button>
                 </div>