0) {
customerOrgId = v[v.length - 1]
this.form.customerOrgParentId = v[0]
} else {
customerOrgId = v // 后台顶级单位ID未获取正确（再获取一次）
- let pids = getTreePids(this.patientRegister.customerOrgTreeAll,"treeChildren","parentId","id",customerOrgId)
- if(Array.isArray(pids) && pids.length > 0){
- if(pids.length == 1){
+ let pids = getTreePids(this.patientRegister.customerOrgTreeAll, "treeChildren", "parentId", "id", customerOrgId)
+ if (Array.isArray(pids) && pids.length > 0) {
+ if (pids.length == 1) {
this.form.customerOrgParentId = customerOrgId
- }else{
+ } else {
this.form.customerOrgParentId = pids[1]
- }
- }
+ }
+ }
}
this.preCustomerOrgId = customerOrgId
// let customerOrgParentId = await this.getParentCustomerOrgId(customerOrgId)
let customerOrgParentId = this.form.customerOrgParentId
-
+
if (customerOrgParentId) {
if (customerOrgParentId == this.dict.personOrgId) {
@@ -1060,7 +1063,7 @@ export default {
} else {
this.changeCustomerOrgGroupId()
}
-
+
}
},
@@ -1457,7 +1460,7 @@ export default {
// // console.log(`/api/patientregister/createreturninfo`, body);
postapi(`/api/PatientRegister/CreatePatientRegister`, body)
.then(res => {
- if (res.code == 1) {
+ if (res.code > -1) {
objCopy(res.data, this.form)
this.dataTransOpts.tableS.patient_register = deepCopy(res.data)
@@ -1477,6 +1480,23 @@ export default {
//一般读身份证照片时，会出现这种情况
if (this.patientRegister.photo && this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(res.data.id, this.patientRegister.photo);
+
+ // 新增保存时，提示是否打条码
+ if (!body.id) {
+ this.$confirm("是否打印 检验 与 Pacs 条码?", "提示", {
+ confirmButtonText: "是",
+ cancelButtonText: "否",
+ type: "warning",
+ })
+ .then(() => {
+ this.labelPrint(false)
+ })
+ .catch((err) => {
+ // if (err == "cancel") {
+ // this.$message.info({ showClose: true, message: "已取消操作" });
+ // }
+ });
+ }
}
}
);
@@ -1738,8 +1758,8 @@ export default {
*/
},
- //条码打印
- lisPrint(ReportCode, isPreview) {
+ //条码打印(lis + pacs)
+ labelPrint(isPreview) {
if (!this.form.id) {
this.$message.info({ showClose: true, message: "人员信息尚未保存，不可执行此操作！" });
return;
@@ -1748,11 +1768,10 @@ export default {
this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" })
return
}
-
let token = window.sessionStorage.getItem('token');
let user = window.sessionStorage.getItem('user');
let toOutShell = {
- ReportCode, token,
+ token, // ReportCode,
IsMoreLabel: 'Y',
isBuildImage: 'N',
IsUploadPdf: 'N',
@@ -1762,6 +1781,18 @@ export default {
{ Name: 'hisLog', Value: 'pic/hisLog.jpg' },
],
};
+
+ // lis条码打印
+ this.lisPrint('0003', isPreview, toOutShell)
+
+ // pacs条码打印
+ this.pacsPrint('0004', isPreview, toOutShell)
+
+ },
+
+ // lis条码打印
+ lisPrint(ReportCode, isPreview, toOutShell) {
+ toOutShell.ReportCode = ReportCode
// console.log('this.$peisAPI.print', toOutShell)
if (isPreview) {
this.$peisAPI.printPre(JSON.stringify(toOutShell))
@@ -1799,6 +1830,45 @@ export default {
}
},
+ //pacs条码打印
+ pacsPrint(ReportCode, isPreview, toOutShell) {
+ toOutShell.ReportCode = ReportCode
+ if (isPreview) {
+ this.$peisAPI.printPre(JSON.stringify(toOutShell))
+ .then(res => {
+ if (JSON.parse(res).code < 0) {
+ this.$message.warning({ showClose: true, message: JSON.parse(res).message });
+ }
+ })
+ .catch((err) => {
+ // console.log('打印pacs条码错误', err)
+ this.$message.warning({ showClose: true, message: `${err}` });
+ });
+ } else {
+
+ this.$peisAPI.print(JSON.stringify(toOutShell))
+ .then(res => {
+ if (JSON.parse(res).code < 0) {
+ this.$message.warning({ showClose: true, message: JSON.parse(res).message });
+ } else {
+ return postapi("/api/app/lisrequest/updatelisrequestisprint", {
+ operateType: 1,
+ patientRegisterId: prId,
+ });
+ }
+ })
+ .then(res => {
+ if (res && res.code < 0) {
+ this.$message.error({ showClose: true, message: `${res.message}` });
+ }
+ })
+ .catch((err) => {
+ // console.log('打印pacs条码错误', err)
+ this.$message.error({ showClose: true, message: `${err}` });
+ });
+ }
+ },
+
//补打条码
reLisRequest() {
if (this.form.id.length < 1) {
diff --git a/src/utlis/proFunc.js b/src/utlis/proFunc.js
index b7b4601..d2ba449 100644
--- a/src/utlis/proFunc.js
+++ b/src/utlis/proFunc.js
@@ -350,7 +350,7 @@ function listOrderBy(arr, keyObjs) {
for (let i = 0; i < arrCount; i++) {
for (let j = 0; j < arrCount - 1; j++) {
for (let k = 0; k < lKeyObjs.length; k++) {
- sortType = lKeyObjs[k]['sortType'] || 'A'
+ sortType = (lKeyObjs[k]['sortType'] || 'A').toUpperCase()
if (sortType == 'A'){
if (arr[j][lKeyObjs[k]['colName']] > arr[j + 1][lKeyObjs[k]['colName']]) {
temp = deepCopy(arr[j])
@@ -378,7 +378,7 @@ function listOrderBy(arr, keyObjs) {
}
}
} catch (error) {
- console.log(`listOrderBy ${error}`);
+ console.log(`listOrderBy error: ${error}`);
}
return arr;
}