From bc4a6cc6afa07e69ba4a5de35b9708da1a48909b Mon Sep 17 00:00:00 2001 From: yangkexiang <1677036288@qq.com> Date: Sat, 9 May 2026 10:39:17 +0800 Subject: [PATCH] =?UTF-8?q?=20bug402:=E4=BD=8F=E9=99=A2=E5=8C=BB=E7=94=9F?= =?UTF-8?q?=E7=AB=99=E8=AF=8A=E6=96=AD=E5=BD=95=E5=85=A5=EF=BC=9A=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E4=BF=9D=E5=AD=98=E8=AF=8A=E6=96=AD=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=87=BA=E7=8E=B0=E9=87=8D=E5=A4=8D=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=B8=94=E9=83=A8=E5=88=86=E6=9D=A1=E7=9B=AE=E5=85=83?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BC=BA=E5=A4=B1.=20=20bug405:=20=E4=BD=8F?= =?UTF-8?q?=E9=99=A2=E5=8C=BB=E7=94=9F=E5=B7=A5=E4=BD=9C=E7=AB=99=EF=BC=9A?= =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E5=8C=BB=E5=98=B1=E4=BF=9D=E5=AD=98=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E5=90=8E=EF=BC=8C=E5=8C=BB=E5=98=B1=E6=9D=A1=E7=9B=AE?= =?UTF-8?q?=E4=BB=8D=E5=A4=84=E4=BA=8E=E5=8F=AF=E7=BC=96=E8=BE=91=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=88=E6=9C=AA=E9=94=81=E5=AE=9A=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DoctorStationDiagnosisAppServiceImpl.java | 5 +++-- .../com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java | 5 +++++ .../mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml | 3 ++- .../views/inpatientDoctor/home/components/order/index.vue | 5 ++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java index ec37db26..3e9d2aa5 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java @@ -39,9 +39,7 @@ import javax.servlet.http.HttpServletRequest; import java.util.Date; import java.util.*; -import static com.openhis.common.constant.CommonConstants.FieldName.DeleteFlag; import static com.openhis.common.enums.ReportCardStatus.SUBMITTED; -import static java.time.LocalDateTime.now; /** * 医生站-诊断 应用实现类 @@ -253,6 +251,9 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn encounterDiagnosis.setMedTypeCode(saveDiagnosisChildParam.getMedTypeCode());// 医疗类型 encounterDiagnosis.setDiagnosisDesc(saveDiagnosisChildParam.getDiagnosisDesc()); // 诊断描述 encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码 + encounterDiagnosis.setDoctor(saveDiagnosisChildParam.getDiagnosisDoctor()); + encounterDiagnosis.setDiagnosisTime(saveDiagnosisChildParam.getDiagnosisTime()); + encounterDiagnosis.setOnsetDate(saveDiagnosisChildParam.getOnsetDate()); // 设置租户ID，避免数据库约束错误 encounterDiagnosis.setTenantId(SecurityUtils.getLoginUser().getTenantId()); // 设置创建人，避免数据库约束错误 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java index 083b2dba..9d0c9459 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java @@ -91,4 +91,9 @@ public class DiagnosisQueryDto { */ private Date diagnosisTime; + /** + * 诊断医生 + */ + private String diagnosisDoctor; + } diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml index 2c721b0f..bad78f21 100755 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml @@ -133,7 +133,8 @@ T2.verification_status_enum, T2.yb_no, T1.onset_date AS onsetDate, - T1.diagnosis_time AS diagnosisTime + T1.diagnosis_time AS diagnosisTime, + T1.doctor AS diagnosisDoctor FROM adm_encounter_diagnosis AS T1 LEFT JOIN cli_condition AS T2 ON T2.ID = T1.condition_id AND T2.delete_flag = '0' AND T2.tcm_flag = 0 diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue index b78302f2..35336e07 100755 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue @@ -610,6 +610,8 @@ function getListInfo(addNewRow) { return { ...parsedContent, ...item, + isEdit: false, + showPopover: false, doseQuantity: parsedContent?.doseQuantity, doseUnitCode_dictText: parsedContent?.doseUnitCode_dictText, // 确保 therapyEnum 被正确设置，优先使用 contentJson 中的值 @@ -802,7 +804,8 @@ function clickRowDb(row, column, event) { return; } row.showPopover = false; - if (row.statusEnum == 1) { + // “待签发(已保存 requestId存在)”不允许再编辑；仅“待保存(无requestId)”允许编辑 + if (row.statusEnum == 1 && !row.requestId) { // 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1') row.therapyEnum = String(row.therapyEnum ?? '1'); row.isEdit = true;