From 7f1f3e1a3b28488e74c813e88055b77dcba42598 Mon Sep 17 00:00:00 2001 From: wangjian963 <15215920+aprilry@user.noreply.gitee.com> Date: Wed, 17 Jun 2026 13:52:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?617=20[=E4=BD=8F=E9=99=A2=E7=99=BB=E8=AE=B0?= =?UTF-8?q?]=20=E2=80=9C=E8=B4=B9=E7=94=A8=E6=80=A7=E8=B4=A8=E2=80=9D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=9D=E5=AD=98=E9=80=BB=E8=BE=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=88=E7=99=BB=E8=AE=B0=E9=80=89=E6=8B=A9=E5=8C=BB?= =?UTF-8?q?=E4=BF=9D=E4=BF=9D=E5=AD=98=E5=90=8E=E5=8F=98=E4=B8=BA=E5=85=A8?= =?UTF-8?q?=E8=87=AA=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/InHospitalRegisterAppServiceImpl.java | 7 ++++--- .../web/inhospitalcharge/dto/InHospitalInfoDto.java | 2 +- .../inhospitalcharge/InHospitalRegisterAppMapper.xml | 4 ++-- .../charge/register/components/awaitList.vue | 10 ++++++++-- .../charge/register/components/patientRegister.vue | 4 ++-- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java index 23f4eba3c..c0579990b 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java @@ -467,8 +467,8 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS iAccountService.save(newCashAccount); } // 更新或创建非自费账户 - String typeCode = StringUtils.isNotEmpty(inHospitalInfoDto.getTypeCoce()) - ? inHospitalInfoDto.getTypeCoce() + String typeCode = StringUtils.isNotEmpty(inHospitalInfoDto.getTypeCode()) + ? inHospitalInfoDto.getTypeCode() : AccountType.PERSONAL_CASH_ACCOUNT.getCode(); if (contractAccount != null) { contractAccount.setContractNo(inHospitalInfoDto.getContractNo()); @@ -617,11 +617,12 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS accountPersonalCash.setBalanceAmount(inHospitalInfoDto.getBalanceAmount()); // 账户余额 // 自费 if (selfFundedFlag) { + accountPersonalCash.setContractNo(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO); // 自费合同编码 accountPersonalCash.setEncounterFlag(Whether.YES.getValue()); } else { // 生成非自费的账号 Account accountNoSelfFunded = new Account(); - accountNoSelfFunded.setTypeCode(inHospitalInfoDto.getTypeCoce()); // 账户类型 + accountNoSelfFunded.setTypeCode(inHospitalInfoDto.getTypeCode()); // 账户类型 accountNoSelfFunded.setPatientId( inHospitalInfoDto.getPatientId() != null ? inHospitalInfoDto.getPatientId() : patient.getId()); // 患者id accountNoSelfFunded.setEncounterId(encounterReg.getId()); // 住院就诊id diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalInfoDto.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalInfoDto.java index 8cd19fe11..daf50d16d 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalInfoDto.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalInfoDto.java @@ -133,7 +133,7 @@ public class InHospitalInfoDto { /** * 账户类型编码 */ - private String typeCoce; + private String typeCode; /** 账户余额 */ private BigDecimal balanceAmount; diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml index ad707cc1b..2cb8459b9 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml @@ -38,7 +38,7 @@ AND aper.delete_flag = '0' LEFT JOIN adm_account AS aa ON aa.encounter_id = ae.ID AND aa.delete_flag = '0' - AND aa.type_code = '04' + AND aa.encounter_flag = 1 LEFT JOIN adm_encounter AS ambae ON ae.amb_encounter_id = ambae.ID LEFT JOIN adm_organization AS ao ON ao.ID = ambae.organization_id AND ao.delete_flag = '0' @@ -142,7 +142,7 @@ LEFT JOIN adm_account AS aa ON aa.encounter_id = ae.ID AND aa.delete_flag = '0' - AND aa.type_code = #{accountType} + AND aa.encounter_flag = 1 WHERE ae.ID = #{encounterId} diff --git a/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/awaitList.vue b/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/awaitList.vue index ef44fac87..53aca8185 100755 --- a/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/awaitList.vue +++ b/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/awaitList.vue @@ -32,8 +32,7 @@
@@ -71,16 +73,19 @@ @@ -262,6 +267,7 @@ getList(); } .table-container { padding: 8px 16px; + overflow-x: auto; } } diff --git a/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/patientRegister.vue b/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/patientRegister.vue index be30c0212..d2537c550 100755 --- a/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/patientRegister.vue +++ b/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/patientRegister.vue @@ -149,7 +149,7 @@ const router = useRouter(); const emits = defineEmits(['okAct', 'cancelAct']); const props = defineProps({ - title: '', + title: { type: String, default: '' }, registrationType: { type: [String, Boolean, Number], // 根据实际类型调整 default: null, // 或者 false、'' 等 @@ -466,7 +466,7 @@ const handleEditSubmit = () => { inWayCode: formData.inWayCode, startTime: formData.startTime, contractNo: formData.contractNo, - typeCoce: formData.typeCoce, + typeCode: formData.typeCode, }; updateRegistration(params).then((res) => { if (res.code == 200) { From 57d14603ee9faf8611d9f9fa734e3f3ce49a629d Mon Sep 17 00:00:00 2001 From: wangjian963 <15215920+aprilry@user.noreply.gitee.com> Date: Wed, 17 Jun 2026 14:16:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?669=20[=E9=97=A8=E8=AF=8A=E5=8C=BB=E7=94=9F?= =?UTF-8?q?=E7=AB=99-=E4=B8=AD=E5=8C=BB=E5=A4=84=E6=96=B9]=20=E4=B8=AD?= =?UTF-8?q?=E5=8C=BB=E5=A4=84=E6=96=B9=E5=A4=B4=E4=BF=A1=E6=81=AF=EF=BC=88?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=80=A7=E8=B4=A8=E3=80=81=E9=A2=91=E6=AC=A1?= =?UTF-8?q?=E3=80=81=E5=A4=A9=E6=95=B0=E3=80=81=E4=BB=98=E6=95=B0=E7=AD=89?= =?UTF-8?q?=EF=BC=89=E5=9C=A8=E4=BF=9D=E5=AD=98=E5=B9=B6=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=90=8E=E5=9B=9E=E6=98=BE=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/tcm/tcmAdvice.vue | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/healthlink-his-ui/src/views/doctorstation/components/tcm/tcmAdvice.vue b/healthlink-his-ui/src/views/doctorstation/components/tcm/tcmAdvice.vue index 45a8480f6..4abc80ce9 100755 --- a/healthlink-his-ui/src/views/doctorstation/components/tcm/tcmAdvice.vue +++ b/healthlink-his-ui/src/views/doctorstation/components/tcm/tcmAdvice.vue @@ -656,6 +656,30 @@ async function getListInfo(addNewRow) { } prescription.prescriptionList = groupedData[groupId]; + + // 🔧 BugFix#669: 从分组数据的第一条提取处方头字段回显 + const firstItem = groupedData[groupId]?.[0]; + if (firstItem) { + if (firstItem.accountId !== undefined && firstItem.accountId !== null) { + prescription.accountId = firstItem.accountId; + } + if (firstItem.methodCode !== undefined && firstItem.methodCode !== null) { + prescription.methodCode = firstItem.methodCode; + } + if (firstItem.rateCode !== undefined && firstItem.rateCode !== null) { + prescription.rateCode = firstItem.rateCode; + } + if (firstItem.dispensePerDuration !== undefined && firstItem.dispensePerDuration !== null) { + prescription.dispensePerDuration = firstItem.dispensePerDuration; + } + if (firstItem.chineseHerbsDoseQuantity !== undefined && firstItem.chineseHerbsDoseQuantity !== null) { + prescription.chineseHerbsDoseQuantity = firstItem.chineseHerbsDoseQuantity; + } + if (firstItem.sufferingFlag !== undefined && firstItem.sufferingFlag !== null) { + prescription.sufferingFlag = firstItem.sufferingFlag; + } + } + return prescription; }); From 7b912ee96c99d27843dcd343579de1778c5cea55 Mon Sep 17 00:00:00 2001 From: guanyu Date: Wed, 17 Jun 2026 14:31:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(#784):=20guanyu=20(=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=88=E5=85=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../medicalOrderProofread/components/api.js | 22 +++++++++++++++++++ .../components/prescriptionList.vue | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/api.js b/healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/api.js index a5398f030..0a03e6c52 100755 --- a/healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/api.js +++ b/healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/api.js @@ -53,4 +53,26 @@ export function cancel(data) { method: 'put', data: data }) +} + +/** + * 医嘱执行 + */ +export function adviceExecute(data) { + return request({ + url: '/nurse-station/advice-process/advice-execute', + method: 'post', + data: data + }) +} + +/** + * 医嘱不执行 + */ +export function adviceNoExecute(data) { + return request({ + url: '/nurse-station/advice-process/advice-void', + method: 'put', + data: data + }) } \ No newline at end of file diff --git a/healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue b/healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue index ed02924fa..9637ae8b2 100755 --- a/healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue +++ b/healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue @@ -373,7 +373,7 @@