From 60bb08925a0ee9ae9803b9efa0303af5461c2bb9 Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Mon, 17 Mar 2025 17:02:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DiagnosisTreatmentController.java | 6 +- .../DoctorStationAdviceAppServiceImpl.java | 4 ++ .../web/doctorstation/dto/AdviceBaseDto.java | 6 ++ .../doctorstation/dto/AdviceInventoryDto.java | 7 +++ .../DoctorStationAdviceAppMapper.xml | 30 ++++++--- .../openhis/common/aspectj/DictAspect.java | 12 ++++ .../openhis/common/enums/ActivityType.java | 30 +++++++++ .../openhis/common/enums/EncounterClass.java | 4 +- .../openhis/common/enums/RequestStatus.java | 62 +++++++++++++++++++ .../openhis/common/enums/TherapyTimeType.java | 26 ++++++++ .../medication/domain/MedicationRequest.java | 9 +-- .../workflow/domain/ActivityDefinition.java | 6 +- .../workflow/domain/DeviceRequest.java | 7 +-- 13 files changed, 182 insertions(+), 27 deletions(-) create mode 100644 openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ActivityType.java create mode 100644 openhis-server/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java create mode 100644 openhis-server/openhis-common/src/main/java/com/openhis/common/enums/TherapyTimeType.java diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java index 08d3bb30..42a0b3a8 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java @@ -198,7 +198,7 @@ public class DiagnosisTreatmentController { for (Long detail : ids) { ActivityDefinition ActivityDefinition = new ActivityDefinition(); ActivityDefinition.setId(detail); - ActivityDefinition.setStatusEnum(PublicationStatus.RETIRED); + ActivityDefinition.setStatusEnum(PublicationStatus.RETIRED.getValue()); ActivityDefinitionList.add(ActivityDefinition); } // 更新诊疗信息 @@ -221,7 +221,7 @@ public class DiagnosisTreatmentController { for (Long detail : ids) { ActivityDefinition ActivityDefinition = new ActivityDefinition(); ActivityDefinition.setId(detail); - ActivityDefinition.setStatusEnum(PublicationStatus.ACTIVE); + ActivityDefinition.setStatusEnum(PublicationStatus.ACTIVE.getValue()); ActivityDefinitionList.add(ActivityDefinition); } // 更新诊疗信息 @@ -241,7 +241,7 @@ public class DiagnosisTreatmentController { ActivityDefinition ActivityDefinition = new ActivityDefinition(); BeanUtils.copyProperties(diagnosisTreatmentUpDto, ActivityDefinition); // 新增外来诊疗目录 - ActivityDefinition.setStatusEnum(PublicationStatus.DRAFT); + ActivityDefinition.setStatusEnum(PublicationStatus.DRAFT.getValue()); return iActivityDefinitionService.addDiagnosisTreatment(ActivityDefinition) ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊疗目录"})) : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null)); 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 a399b95b..a3a7041f 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 @@ -14,7 +14,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.common.constant.CommonConstants; +import com.openhis.common.enums.ActivityType; import com.openhis.common.enums.ConditionCode; +import com.openhis.common.utils.EnumUtils; import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService; import com.openhis.web.doctorstation.dto.AdviceBaseDto; @@ -119,6 +121,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp .collect(Collectors.toList()); // 诊疗-赋值 for (AdviceBaseDto baseDto : activityList) { + // 活动类型 + baseDto.setActivityType_enumText(EnumUtils.getInfoByValue(ActivityType.class, baseDto.getActivityType())); List priceList = mainCharge.stream().filter(e -> baseDto.getChargeItemDefinitionId().equals(e.getDefinitionId())) .collect(Collectors.toList()); diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java index 71c56910..626f8c73 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java @@ -43,6 +43,12 @@ public class AdviceBaseDto { /** 商品名称 */ private String productName; + /** + * 活动类型 + */ + private Integer activityType; + private String activityType_enumText; + /** 包装单位 */ @Dict(dictCode = "unit_code") private String unitCode; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java index b7e0899a..50c8c9e2 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java @@ -42,9 +42,16 @@ public class AdviceInventoryDto { /** 产品批号 */ private String lotNumber; + /** 库房id */ + @JsonSerialize(using = ToStringSerializer.class) + private Long locationId; + /** * 库房名称 */ private String locationName; + /** 采购单价(进价) */ + private BigDecimal price; + } diff --git a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml index 33d1e52b..7d4f4699 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml @@ -14,6 +14,7 @@ abi.wb_str, abi.yb_no, abi.product_name, + abi.activity_type, abi.unit_code, abi.min_unit_code, abi.volume, @@ -35,6 +36,7 @@ T1.wb_str AS wb_str, T1.yb_no AS yb_no, T1.merchandise_name AS product_name, + 0 AS activity_type, T1.unit_code AS unit_code, T1.min_unit_code AS min_unit_code, T2.total_volume AS volume, @@ -67,6 +69,7 @@ T1.wb_str AS wb_str, T1.yb_no AS yb_no, '' AS product_name, + 0 AS activity_type, T1.unit_code AS unit_code, T1.min_unit_code AS min_unit_code, T1.SIZE AS volume, @@ -97,6 +100,7 @@ T1.wb_str AS wb_str, T1.yb_no AS yb_no, '' AS product_name, + T1.type_enum AS activity_type, '' AS unit_code, '' AS min_unit_code, '' AS volume, @@ -125,6 +129,8 @@ T1.min_quantity, T1.min_unit_code, T1.lot_number, + T1.price, + T1.location_id, T2.NAME AS location_name FROM wor_inventory_item AS T1 @@ -145,20 +151,26 @@