diff --git a/public/sysConfig.json b/public/sysConfig.json
index 5964923..0864a2d 100644
--- a/public/sysConfig.json
+++ b/public/sysConfig.json
@@ -1,5 +1,5 @@
{
- "apiurl": "http://192.168.0.188:9530",
+ "apiurl": "http://192.168.0.188:9527",
"softName": "神豚体检管理系统",
"pacsApi": "http://192.168.0.188:9530",
"dcmViewers": "https://app.mzaktj.com:4436",
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index a51d943..637204a 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -45,10 +45,15 @@
-
-
-
-
+
+
+
+
+ 档案号
+
+
+
+
@@ -70,14 +75,14 @@
+
-
+
-
+
@@ -156,8 +161,7 @@
-
+
@@ -237,7 +241,7 @@
:style="'width:' + Math.floor((window.pageWidth - 654) / 6) + 'px;'" @change="changeMedicalTimes"
value-key="id">
+ :value="item.id" :disabled="item.isComplete == 'Y' ? true:false" />
@@ -530,9 +534,6 @@
手动合并项目
-->
-
-
-
全个人支付
@@ -788,7 +789,7 @@
+ :value="item" :disabled="item.isComplete == 'Y' ? true:false" />
@@ -1114,6 +1115,9 @@ export default {
this.initFormData(this.dataTransOpts.tableS.patient_register.id)
// 表单中 回车 代替 tab
this.enterToTab();
+
+ // 档案号元素，添加双击监听
+ this.addDoubleClickListener()
},
computed: {
@@ -1907,7 +1911,10 @@ export default {
this.patientChoosed = { id: '' } // 清空之前的选择
//编辑的时候不查重
- if (this.form.id || !param) return;
+ // if (this.form.id || !param) return;
+
+ //编辑的时候档案号为空则查重，允许修改档案号
+ if (this.form.patientNo || !param) return;
//// console.log(`/api/app/patient/in-filter?Filter=${param}`)
let body = {
@@ -1944,6 +1951,27 @@ export default {
this.choosePatient()
},
+ // 档案号元素，添加双击监听
+ addDoubleClickListener() {
+ // 获取el-input内部的input元素
+ console.log("addDoubleClickListener1")
+ const inputElement = this.$refs.patientNoInput.$el.querySelector('input')
+ if (inputElement) {
+ inputElement.addEventListener('dblclick', (event) => {
+ this.dbClearPatientNo()
+ })
+ console.log("addDoubleClickListener2")
+ }
+ },
+
+ // 双击档案号，清除档案号（一般用于修改档案号）
+ // 再在姓名或身份证中回车，选择新的档案号
+ dbClearPatientNo() {
+ console.log("dbClearPatientNo")
+ this.form.patientNo = ''
+ this.form.patientId = "00000000-0000-0000-0000-000000000000" //档案号ID 选择了档案就传档案号，未选就传00000-0000...
+ },
+
//确定选择人员
choosePatient() {
if (!this.patientChoosed.id) {
@@ -2032,12 +2060,17 @@ export default {
} else {
body.age = Number(body.age)
}
+ // if(body.medicalTimes){
+ // body.medicalTimes = Number(body.medicalTimes)||1
+ // }else{
+ // body.medicalTimes = 1
+ // }
// // console.log('body',body)
// Invalid date
delete body.registerManType;
delete body.patientRegisterNo;
- delete body.medicalTimes;
+ delete body.medicalTimes;
// delete body.completeFlag;
delete body.isMedicalStart;
delete body.patientNo;
@@ -3367,7 +3400,7 @@ export default {
// "displayOrder": 1
this.dataTransOpts.tableM.register_check_asbitem = deepCopy(this.dataTransOpts.tableM.appoint_register_asbitem)
- this.changeIdNo() // 触发身份证查询档案号
+ this.changeIdNo('N') // 触发身份证查询档案号
})
},
@@ -3464,7 +3497,7 @@ export default {
// 触发分组 项目
if (this.form.customerOrgGroupId) this.changeCustomerOrgGroupId()
- this.changeIdNo() // 触发身份证查询档案号
+ this.changeIdNo('N') // 触发身份证查询档案号
})
},
@@ -3808,9 +3841,17 @@ export default {
event.preventDefault();
// 如果是身份证，则计算出生与年龄
- let placeholder = input.getAttribute('placeholder')
- if (placeholder == '身份证号') this.changeIdNo()
-
+ let colName = input.getAttribute('data-col')
+ switch (colName) {
+ case "idNo":
+ this.changeIdNo('N')
+ break;
+ case "patientName":
+ this.changePatientName()
+ break;
+ default:
+ break;
+ }
// 跳至下一个输入框
for (let j = i + 1; j < inputs.length; j++) {
if (inputs[j].getAttribute('disabled') != "disabled") {
diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue
index d3744f2..ca46fb2 100644
--- a/src/components/report/BtnReport.vue
+++ b/src/components/report/BtnReport.vue
@@ -200,6 +200,7 @@ export default {
},
data() {
return {
+ medical_report_print_after_summary_check_is_audit:'N', // Y-审核后才可以打印报告，N-没审核未总检亦可以打印
dialogGetReport: false,
dialogVisibleCheckHistory: false,
tabChoosed: "2",
@@ -380,12 +381,22 @@ export default {
};
},
- created() {},
+ created() {
+ // 获取 是否审核才能打印报告
+ postapi("/api/app/SysParmValue/GetSysParmValueBySysParmId",
+ { sysParmId:"medical_report_print_after_summary_check_is_audit" }
+ ).then(res => {
+ if(res.code > -1){
+ this.medical_report_print_after_summary_check_is_audit = res.data.toUpperCase() || 'N'
+ }
+ });
+ },
//挂载完成
mounted() {
this.dataTransOpts.tableS.patient_register.id = "";
// this.getPatientRegister(this.dataTransOpts.tableS.patient_register.patientRegisterNo)
+
},
computed: {
@@ -789,6 +800,7 @@ export default {
let user = window.sessionStorage.getItem("user");
let toOutShell = {
ReportCode,
+ Templatecode:undefined,
token,
isBuildImage: "N",
IsUploadPdf: "N",
@@ -817,23 +829,17 @@ export default {
],
};
- // 总检审核后才能打印
- if (rds[0].completeFlag != "3") toOutShell.preViewCanPrint = "N";
- if (toOutShell.preViewCanPrint == "Y" && rds[0].isAudit == "N") {
- let sysParmId = "medical_report_print_after_summary_check_is_audit";
- let sysParam = await postapi(
- "/api/app/SysParmValue/GetSysParmValueBySysParmId",
- { sysParmId }
- );
- if (sysParam.data.toUpperCase() == "Y")
- toOutShell.preViewCanPrint = "N";
+ // 总检审核后才能打印（预览用）
+ 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);
- console.log("$peisAPI.printPre", JSONtoOutShell);
+ let JSONtoOutShell = JSON.stringify(toOutShell);
if (isPreview) {
+ console.log("$peisAPI.printPre", toOutShell,JSONtoOutShell);
this.$peisAPI
.printPre(JSONtoOutShell)
.then((res) => {
@@ -856,16 +862,16 @@ export default {
toOutShell.ReportCode =
rd.isPatientOccupationalDisease == "Y" ? "0006" : "0005";
toOutShell.BusinessCode = rd.patientRegisterId;
- if (rd.completeFlag != "3") toOutShell.preViewCanPrint = "N";
- if (toOutShell.preViewCanPrint == "Y" && rd.isAudit == "N") {
- let sysParmId = "medical_report_print_after_summary_check_is_audit";
- let sysParam = await postapi(
- "/api/app/SysParmValue/GetSysParmValueBySysParmId",
- { sysParmId }
- );
- if (sysParam.data.toUpperCase() == "Y")
- toOutShell.preViewCanPrint = "N";
- }
+
+ // 选择报告打印模版
+ if(toOutShell.ReportCode == "0005" && rd.reportFormatTemplateId) toOutShell.Templatecode = rd.reportFormatTemplateId
+
+
+ // 审核了才可以打印
+ 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 (toOutShell.preViewCanPrint == "N") {
this.$message.warning({
@@ -874,8 +880,12 @@ export default {
});
continue;
}
- JSONtoOutShell = JSON.stringify(toOutShell);
+
try {
+ JSONtoOutShell = JSON.stringify(toOutShell);
+ // 防止打印太多数据 只输出 第一条
+ if(i == 0) console.log('this.$peisAPI.print',toOutShell,JSONtoOutShell)
+
let lres = await this.$peisAPI.print(JSONtoOutShell);
if (JSON.parse(lres).code < 0) {
this.$message.warning({