|
@@ -967,7 +967,7 @@ function closeObjectWebui(ReOpen) {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- var symptomID=$("#symptom").attr("data-target");
|
|
|
+ var symptomID = $("#symptom").attr("data-target");
|
|
|
if (symptomID != null && symptomID != "null" && symptomID != "") {
|
|
|
//选择框打开
|
|
|
if ($("#" + symptomID).hasClass("in") || $("#" + symptomID).css("display") == "block") {
|
|
@@ -977,7 +977,7 @@ function closeObjectWebui(ReOpen) {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- var weightID=$("#weight").attr("data-target");
|
|
|
+ var weightID = $("#weight").attr("data-target");
|
|
|
if (weightID != null && weightID != "null" && weightID != "") {
|
|
|
//选择框打开
|
|
|
if ($("#" + weightID).hasClass("in") || $("#" + weightID).css("display") == "block") {
|
|
@@ -987,7 +987,7 @@ function closeObjectWebui(ReOpen) {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- var diagnoseID=$("#diagnose").attr("data-target");
|
|
|
+ var diagnoseID = $("#diagnose").attr("data-target");
|
|
|
if (diagnoseID != null && diagnoseID != "null" && diagnoseID != "") {
|
|
|
//选择框打开
|
|
|
if ($("#" + diagnoseID).hasClass("in") || $("#" + diagnoseID).css("display") == "block") {
|
|
@@ -2919,8 +2919,8 @@ function editPrescription(jsonData, type) {
|
|
|
}
|
|
|
currentOrderNo = tempOrderNo;
|
|
|
}
|
|
|
- }else{
|
|
|
- currentOrderNo=orderNo;
|
|
|
+ } else {
|
|
|
+ currentOrderNo = orderNo;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -6228,7 +6228,11 @@ function checkYpInfo(code, serial, groupNo, needNotice, orderNo) {
|
|
|
var tableId = $("#xyTab li.active").find("a").attr("href");
|
|
|
var childrens = $(tableId).find("div:eq(0)").children().length;
|
|
|
var currentGroupNo = $(tableId).find("input.current_groupNo").val();
|
|
|
- if (childrens === 5 && $(tableId).is(':last-child')) {
|
|
|
+ var flag = childrens === 5;
|
|
|
+ if (!needNotice) {
|
|
|
+ flag = childrens === 5 && $(tableId).is(':last-child');
|
|
|
+ }
|
|
|
+ if (flag) {
|
|
|
if (needNotice) {
|
|
|
$("#messageModal").modal();
|
|
|
$("#messageContent").html("单张处方最多只能开具5个药品,是否需要新增处方?");
|