{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName :
@@ -233,6 +231,7 @@ export default {
checkCompleteFlag: '', //检查项目状态
isAuditCheck: '', //检查项目审核
medicalTypeIds: [],
+ personnelTypeIds: [],
checkDoctorIds: [],
summaryDoctorIds: [],
},
@@ -272,9 +271,9 @@ export default {
...mapState(["window", "dataTransOpts", "dict", "customerOrg", "patientRegister", "doctorCheck", "sumDoctorCheck", "report"]),
divHeight() {
if (this.win == "doctorCheck") {
- return 240
+ return 210
} else {
- return 170
+ return 175
}
},
tableHeight() {
@@ -331,6 +330,13 @@ export default {
}
});
+ //人员类别
+ getapi("/api/app/personnel-type/in-filter").then((res) => {
+ if (res.code == 1) {
+ this.dict.personnelType = res.data;
+ }
+ });
+
// 获取组合项目
postapi('/api/app/asbitem/GetBasicList', { isFilterActive: 'Y' }).then(res => {
if (res.code != -1) {
@@ -501,6 +507,10 @@ export default {
if (Array.isArray(this.local.query.medicalTypeIds) && this.local.query.medicalTypeIds.length > 0) {
body.medicalTypeIds = this.local.query.medicalTypeIds
}
+ if (Array.isArray(this.local.query.personnelTypeIds) && this.local.query.personnelTypeIds.length > 0) {
+ body.personnelTypeIds = this.local.query.personnelTypeIds
+ }
+
if (Array.isArray(this.local.query.checkDoctorIds) && this.local.query.checkDoctorIds.length > 0) {
body.checkDoctorIds = this.local.query.checkDoctorIds
}
diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue
index ca46fb2..bfef8ac 100644
--- a/src/components/report/BtnReport.vue
+++ b/src/components/report/BtnReport.vue
@@ -2,151 +2,81 @@
- 查询
+ 查询
- 导入检查结果
+ 导入检查结果
- 导入检验结果
+ 导入检验结果
- 预览报告
+ 预览报告
- 打印报告
+ 打印报告
- 导出 pdf 报告
+ 导出 pdf 报告
- 领取报告
+ 领取报告
- 上传Web
+ 上传Web
- 历次结果
+ 历次结果
- 人员信息导出
+ 人员信息导出
- 导出Zip
+ 导出Zip
- 导出Jpg
+ 导出Jpg
-
+
-
+
-
+
-
+
@@ -155,16 +85,10 @@
-->
-
+
-
+
@@ -200,7 +124,7 @@ export default {
},
data() {
return {
- medical_report_print_after_summary_check_is_audit:'N', // Y-审核后才可以打印报告，N-没审核未总检亦可以打印
+ medical_report_print_after_summary_check_is_audit: 'N', // Y-审核后才可以打印报告，N-没审核未总检亦可以打印
dialogGetReport: false,
dialogVisibleCheckHistory: false,
tabChoosed: "2",
@@ -384,9 +308,9 @@ export default {
created() {
// 获取 是否审核才能打印报告
postapi("/api/app/SysParmValue/GetSysParmValueBySysParmId",
- { sysParmId:"medical_report_print_after_summary_check_is_audit" }
+ { sysParmId: "medical_report_print_after_summary_check_is_audit" }
).then(res => {
- if(res.code > -1){
+ if (res.code > -1) {
this.medical_report_print_after_summary_check_is_audit = res.data.toUpperCase() || 'N'
}
});
@@ -800,7 +724,7 @@ export default {
let user = window.sessionStorage.getItem("user");
let toOutShell = {
ReportCode,
- Templatecode:undefined,
+ Templatecode: undefined, // 新加打印模版
token,
isBuildImage: "N",
IsUploadPdf: "N",
@@ -829,17 +753,26 @@ export default {
],
};
- // 总检审核后才能打印（预览用）
- if(this.medical_report_print_after_summary_check_is_audit == 'Y'){
- //if (rds[0].completeFlag != "3") toOutShell.preViewCanPrint = "N";
- if (rds[0].isAudit == "N") toOutShell.preViewCanPrint = "N";
- }
-
- // let res = await postapi(`/api/app/printreport/getpeisreport?PatientRegisterId=${this.patientRegister.patientRegisterId}`)
- // toOutShell.ReportTable = res.data
- let JSONtoOutShell = JSON.stringify(toOutShell);
+
+ let JSONtoOutShell = ''
if (isPreview) {
- console.log("$peisAPI.printPre", toOutShell,JSONtoOutShell);
+ toOutShell.ReportCode =
+ rds[0].isPatientOccupationalDisease == "Y" ? "0006" : "0005";
+
+ toOutShell.BusinessCode = rds[0].patientRegisterId;
+
+ // 选择报告打印模版
+ if (toOutShell.ReportCode == "0005" && rd.reportFormatTemplateId) toOutShell.Templatecode = rds[0].reportFormatTemplateId
+
+
+ // 审核了才可以打印
+ if (this.medical_report_print_after_summary_check_is_audit == 'Y') {
+ //if (rd.completeFlag != "3") toOutShell.preViewCanPrint = "N";
+ if (rds[0].isAudit == "N") toOutShell.preViewCanPrint = "N";
+ }
+
+ JSONtoOutShell = JSON.stringify(toOutShell);
+ console.log("$peisAPI.printPre", toOutShell, JSONtoOutShell);
this.$peisAPI
.printPre(JSONtoOutShell)
.then((res) => {
@@ -864,14 +797,14 @@ export default {
toOutShell.BusinessCode = rd.patientRegisterId;
// 选择报告打印模版
- if(toOutShell.ReportCode == "0005" && rd.reportFormatTemplateId) toOutShell.Templatecode = rd.reportFormatTemplateId
-
+ if (toOutShell.ReportCode == "0005" && rd.reportFormatTemplateId) toOutShell.Templatecode = rd.reportFormatTemplateId
+
// 审核了才可以打印
- if(this.medical_report_print_after_summary_check_is_audit == 'Y'){
+ if (this.medical_report_print_after_summary_check_is_audit == 'Y') {
//if (rd.completeFlag != "3") toOutShell.preViewCanPrint = "N";
- if(rd.isAudit == "N") toOutShell.preViewCanPrint = "N";
- }
+ if (rd.isAudit == "N") toOutShell.preViewCanPrint = "N";
+ }
if (toOutShell.preViewCanPrint == "N") {
this.$message.warning({
@@ -880,11 +813,11 @@ export default {
});
continue;
}
-
+
try {
JSONtoOutShell = JSON.stringify(toOutShell);
// 防止打印太多数据 只输出 第一条
- if(i == 0) console.log('this.$peisAPI.print',toOutShell,JSONtoOutShell)
+ if (i == 0) console.log('this.$peisAPI.print', toOutShell, JSONtoOutShell)
let lres = await this.$peisAPI.print(JSONtoOutShell);
if (JSON.parse(lres).code < 0) {
@@ -1006,17 +939,17 @@ export default {
try {
// 石家庄长城 手动导出没有总检也可以导出
//if (e.completeFlag == "3") {
- toOutShell.BusinessCode = e.patientRegisterId;
- toOutShell.ExportDirectory = `${path}\\${e.patientName}_${e.patientRegisterNo}.pdf`;
- toOutShell.customerOrgName = e.customerOrgName || ""; // 增加单位名称参数
- toOutShell.departmentName = e.departmentName || "";
-
- let jsonToOutShell = JSON.stringify(toOutShell);
- console.log("toOutShell", jsonToOutShell);
- let res = await this.$peisAPI.exportToPdfPre(jsonToOutShell);
- if (JSON.parse(res).code < 0) {
- console.log("this.$peisAPI.exportToPdfPre err", res);
- }
+ toOutShell.BusinessCode = e.patientRegisterId;
+ toOutShell.ExportDirectory = `${path}\\${e.patientName}_${e.patientRegisterNo}.pdf`;
+ toOutShell.customerOrgName = e.customerOrgName || ""; // 增加单位名称参数
+ toOutShell.departmentName = e.departmentName || "";
+
+ let jsonToOutShell = JSON.stringify(toOutShell);
+ console.log("toOutShell", jsonToOutShell);
+ let res = await this.$peisAPI.exportToPdfPre(jsonToOutShell);
+ if (JSON.parse(res).code < 0) {
+ console.log("this.$peisAPI.exportToPdfPre err", res);
+ }
//}
} catch (error) {
console.log("error", error);
@@ -1088,13 +1021,13 @@ export default {
newRow.isAudit == "Y"
? "已审核"
: dddw(
- this.dict.completeFlag,
- "id",
- newRow.completeFlag,
- "displayName"
- );
+ this.dict.completeFlag,
+ "id",
+ newRow.completeFlag,
+ "displayName"
+ );
newRow.isReportPrint = newRow.isReportPrint == "Y" ? "√" : "";
- if (newRow.idNo) newRow.idNo = "\u200C"+newRow.idNo;
+ if (newRow.idNo) newRow.idNo = "\u200C" + newRow.idNo;
if (newRow.patientRegisterNo)
newRow.patientRegisterNo = "\u200C" + newRow.patientRegisterNo;
if (newRow.patientNo) newRow.patientNo = "\u200C" + newRow.patientNo;
diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue
index 441243e..310e085 100644
--- a/src/components/sumDoctorCheck/ButtonList.vue
+++ b/src/components/sumDoctorCheck/ButtonList.vue
@@ -101,7 +101,7 @@
+ :style="`z-index:3;border-radius: 10px;border: 1px solid #ddd;background-color:#FFF; position: absolute;top:50px;right:120px;width:350px;height: ${window.pageHeight - 42 - 10}px;opacity:1;`">