From 8909e48ea017736473d60e12c5265139eee09070 Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Sun, 30 Mar 2025 13:14:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E8=AF=8A=E6=9F=A5=E8=AF=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20=E6=94=AF=E4=BB=98=E7=B1=BB=E5=9E=8B=E5=92=8C?= =?UTF-8?q?=E6=8C=82=E5=8F=B7=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DoctorStationAdviceAppServiceImpl.java | 4 ++-- .../openhis/web/doctorstation/dto/PatientInfoDto.java | 11 +++++++++++ .../doctorstation/DoctorStationMainAppMapper.xml | 5 ++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java index e67d7c54..c347dc02 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java @@ -269,7 +269,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp medicationRequest.setDispensePerDuration(adviceSaveDto.getDispensePerDuration()); // 每次发药供应天数 medicationRequest.setSkinTestFlag(adviceSaveDto.getSkinTestFlag()); // 皮试标记 medicationRequest.setGroupId(adviceSaveDto.getGroupId());// 分组id - // medicationRequest.setPackageId(adviceSaveDto.getPackageId()); + // medicationRequest.setPackageId(adviceSaveDto.getPackageId()); // 组套id iMedicationRequestService.save(medicationRequest); @@ -323,7 +323,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp } // deviceRequest.setLocationId(adviceSaveDto.getLocationId()); 请求发起的位置 deviceRequest.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id - // deviceRequest.setPackageId(adviceSaveDto.getPackageId()); + // deviceRequest.setPackageId(adviceSaveDto.getPackageId()); // 组套id // deviceRequest.setActivityId(adviceSaveDto.getActivityId()); iDeviceRequestService.save(deviceRequest); diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java index e547ac23..7723395d 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java @@ -4,6 +4,7 @@ import java.util.Date; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; @@ -76,4 +77,14 @@ public class PatientInfoDto { */ private Integer allergyHistoryFlag; + /** + * 挂号时间 + */ + private Date registerTime; + + /** 账户类型编码 */ + @Dict(dictCode = "account_code") + private String typeCode; + private String typeCode_dictText; + } diff --git a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml index 029636f8..1443f4a6 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml @@ -15,7 +15,9 @@ T10.birth_date, T10.status_enum, T10.allergy_history_flag, - T10.account_id + T10.account_id, + T10.type_code, + T10.register_time from ( SELECT T1.tenant_id AS tenant_id, @@ -26,6 +28,7 @@ T5.user_id AS practitioner_user_id, T5.NAME AS practitioner_name, T6.id AS account_id, + T6.type_code AS type_code, T7.contract_name AS contract_name, T8.ID AS patient_id, T8.NAME AS patient_name,