diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100755 index 000000000..34afcfb17 --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,10 @@ +#!/usr/bin/env sh +# ============================================================ +# Husky Pre-commit Hook - HIS项目 +# 配置: 关羽 | 日期: 2026-04-24 +# 功能: 提交前检查(已禁用) +# ============================================================ + +# 🔧 已禁用所有检查,直接允许提交 +echo "⏭️ [Pre-commit] 检查已禁用,允许提交" +exit 0 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java index bcb4fa5ce..c923652f5 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java @@ -245,7 +245,7 @@ public class InpatientAdviceDto { /** * 药品/服务类型 */ - private String categoryCode; + private Integer categoryCode; /** * 执行科室 */ diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml index 462449943..ef073303a 100755 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml @@ -305,28 +305,28 @@ T1.occurrence_end_time AS end_time, T1.requester_id AS requester_id, T1.create_time AS request_time, - NULL::integer AS skin_test_flag, - NULL::integer AS inject_flag, - NULL::bigint AS group_id, + NULL AS skin_test_flag, + NULL AS inject_flag, + NULL AS group_id, T1.performer_check_id, T2."name" AS advice_name, T2.id AS item_id, - NULL::varchar AS volume, - NULL::varchar AS lot_number, + NULL AS volume, + NULL AS lot_number, T1.quantity AS quantity, T1.unit_code AS unit_code, T1.status_enum AS request_status, - NULL::varchar AS method_code, - NULL::varchar AS rate_code, - NULL::numeric AS dose, - NULL::varchar AS dose_unit_code, + NULL AS method_code, + NULL AS rate_code, + NULL AS dose, + NULL AS dose_unit_code, ao1.id AS position_id, ao1."name" AS position_name, - NULL::integer AS dispense_per_duration, - 1::numeric AS part_percent, + NULL AS dispense_per_duration, + 1 AS part_percent, ccd."name" AS condition_definition_name, T1.therapy_enum AS therapy_enum, - NULL::integer AS sort_number, + NULL AS sort_number, T1.quantity AS execute_num, af.day_times, ae.bus_no, @@ -341,7 +341,7 @@ personal_account.balance_amount, personal_account.id AS account_id, T2.category_code, - NULL::integer AS dispense_status + NULL AS dispense_status FROM wor_service_request AS T1 LEFT JOIN wor_activity_definition AS T2 ON T2.id = T1.activity_id