|
@@ -327,9 +327,9 @@ function initFeeTable() {
|
|
|
if (row.settleType == 0) {
|
|
|
str += '<button type="button" class="registration-no-color-foot-button"title="出院结算" onclick="settlement(\'' + row.inpatientNo + '\',' + row.admissTimes + ')"><i class="fa fa-credit-card"></i></button>';
|
|
|
}
|
|
|
- str += '<button type="button" class="registration-no-color-foot-button"title="立即出院" onclick="leaveHospital(\'' + row.inpatientNo + '\',' + row.admissTimes + ')"><i class="fa fa-sign-out"></i></button>';
|
|
|
+ str += '<button type="button" class="registration-no-color-foot-button"title="立即出院" onclick="leaveHospital(\'' + row.inpatientNo + '\',' + row.admissTimes + ',\''+row.name+'\')"><i class="fa fa-sign-out"></i></button>';
|
|
|
} else if (payMarkGroup == 1) {
|
|
|
- str += '<button type="button" class="registration-no-color-foot-button"title="出院召回" onclick="recall(\'' + row.inpatientNo + '\',' + row.admissTimes + ')"><i class="fa fa-reply-all"></i></button>';
|
|
|
+ str += '<button type="button" class="registration-no-color-foot-button"title="出院召回" onclick="recall(\'' + row.inpatientNo + '\',' + row.admissTimes + ',\''+row.name+'\')"><i class="fa fa-reply-all"></i></button>';
|
|
|
if (row.settleType == 0) {
|
|
|
str += '<button type="button" class="registration-no-color-foot-button"title="出院结算" onclick="settlement(\'' + row.inpatientNo + '\',' + row.admissTimes + ')"><i class="fa fa-credit-card"></i></button>';
|
|
|
} else if (row.settleType == 1) {
|
|
@@ -568,13 +568,14 @@ function showZyLedgerFile(row) {
|
|
|
* @param inpatientNo
|
|
|
* @param admissTimes
|
|
|
*/
|
|
|
-function leaveHospital(inpatientNo, admissTimes) {
|
|
|
- if (!confirm("确定要将住院号为【" + inpatientNo.trim() + "】,住院次数为【" + admissTimes + "】的病人住院记录进行直接出院吗?")) {
|
|
|
+function leaveHospital(inpatientNo, admissTimes,name) {
|
|
|
+ if (!confirm("确定要将病人【" + name.trim() + "】,置为出院状态吗?")) {
|
|
|
return;
|
|
|
}
|
|
|
+
|
|
|
$.ajax({
|
|
|
type: "GET",
|
|
|
- url: '/thmz/leaveHospital?inpatientNo=' + inpatientNo + "&admissTimes=" + admissTimes,
|
|
|
+ url: '/thmz/settlementInfo?inpatientNo=' + inpatientNo + "&admissTimes=" + admissTimes,
|
|
|
contentType: "application/json;charset=UTF-8",
|
|
|
dataType: "json",
|
|
|
headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
|
|
@@ -584,14 +585,37 @@ function leaveHospital(inpatientNo, admissTimes) {
|
|
|
window.location.href = '/thmz/login/view';
|
|
|
return;
|
|
|
}
|
|
|
- if (res.code == 0) {
|
|
|
- $('#tb_table').bootstrapTable("refresh");
|
|
|
- successMesage(res);
|
|
|
- } else {
|
|
|
+ if (res.code == -2) {
|
|
|
+ if (!confirm(res.message)) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ } else if (res.code == -1){
|
|
|
errorMesage(res);
|
|
|
+ return;
|
|
|
}
|
|
|
+ $.ajax({
|
|
|
+ type: "GET",
|
|
|
+ url: '/thmz/leaveHospital?inpatientNo=' + inpatientNo + "&admissTimes=" + admissTimes,
|
|
|
+ contentType: "application/json;charset=UTF-8",
|
|
|
+ dataType: "json",
|
|
|
+ headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
|
|
|
+ async: false,
|
|
|
+ success: function (res) {
|
|
|
+ if (res == '401' || res == 401) {
|
|
|
+ window.location.href = '/thmz/login/view';
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (res.code == 0) {
|
|
|
+ $('#tb_table').bootstrapTable("refresh");
|
|
|
+ successMesage(res);
|
|
|
+ } else {
|
|
|
+ errorMesage(res);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
});
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|
|
@@ -600,8 +624,8 @@ function leaveHospital(inpatientNo, admissTimes) {
|
|
|
* @param inpatientNo
|
|
|
* @param admissTimes
|
|
|
*/
|
|
|
-function recall(inpatientNo, admissTimes) {
|
|
|
- if (!confirm("确定要将住院号为【" + inpatientNo.trim() + "】,住院次数为【" + admissTimes + "】的病人住院记录进行召回吗?")) {
|
|
|
+function recall(inpatientNo, admissTimes,name) {
|
|
|
+ if (!confirm("确定要将病人【" + name.trim() + "】,做召回处理吗?")) {
|
|
|
return;
|
|
|
}
|
|
|
$.ajax({
|