diff --git a/openhis-server-new/core-system/pom.xml b/openhis-server-new/core-system/pom.xml index acfb3a70..b3408d36 100644 --- a/openhis-server-new/core-system/pom.xml +++ b/openhis-server-new/core-system/pom.xml @@ -23,20 +23,12 @@ com.core core-common -<<<<<<< HEAD org.projectlombok lombok -======= - - org.projectlombok - lombok - true - ->>>>>>> v1.3 io.swagger swagger-annotations diff --git a/openhis-server-new/openhis-application/src/main/resources/application-prd.yml b/openhis-server-new/openhis-application/src/main/resources/application-prd.yml index cddeb08b..32581f8b 100644 --- a/openhis-server-new/openhis-application/src/main/resources/application-prd.yml +++ b/openhis-server-new/openhis-application/src/main/resources/application-prd.yml @@ -6,15 +6,9 @@ spring: druid: # 主库数据源 master: -<<<<<<< HEAD:openhis-server-new/openhis-application/src/main/resources/application-prd.yml url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=hisprd&characterEncoding=UTF-8&client_encoding=UTF-8 username: postgresql password: Jchl1528 -======= - url: jdbc:postgresql://192.168.2.15:5432/openhis-xz?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8 - username: postgres - password: root ->>>>>>> v1.3:openhis-server-new/openhis-application/src/main/resources/application-prod.yml # 从库数据源 slave: # 从数据源开关/默认关闭 @@ -68,11 +62,7 @@ spring: # redis 配置 redis: # 地址 -<<<<<<< HEAD:openhis-server-new/openhis-application/src/main/resources/application-prd.yml host: 192.168.110.252 -======= - host: 172.16.101.2 ->>>>>>> v1.3:openhis-server-new/openhis-application/src/main/resources/application-prod.yml # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/openhis-server-new/openhis-application/src/main/resources/application.yml b/openhis-server-new/openhis-application/src/main/resources/application.yml index 8548d805..a8228c06 100644 --- a/openhis-server-new/openhis-application/src/main/resources/application.yml +++ b/openhis-server-new/openhis-application/src/main/resources/application.yml @@ -49,11 +49,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: -<<<<<<< HEAD active: dev -======= - active: prod # (天翼云)cloud （本地测试）test （本地）local （生产）prod (农大) ->>>>>>> v1.3 # 文件上传 servlet: multipart: diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailAppMapper.xml index b4e8832d..b1d79446 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailAppMapper.xml @@ -28,10 +28,7 @@ ii.min_unit_code, ii.part_percent, ii.approval_number, -<<<<<<< HEAD -======= ii.item_id, ->>>>>>> v1.3 ii.dose_form_code, ii.total_volume, ii.sale_price, @@ -40,292 +37,6 @@ ii.location_name, ii.location_store_name, ii.supplier_name -<<<<<<< HEAD - FROM (SELECT wii.id AS inventory_id, - wii.production_date, - wii.expiration_date, - (wii.expiration_date::date - CURRENT_DATE) AS remaining_days, - wii.inventory_status_enum, - wii.location_id, - wii.location_store_id, - wii.lot_number, - wii.quantity, - wii.supplier_id, - wii.tenant_id, - #{medMedicationDefinition} AS item_table, - mmd."name" AS item_name, - mmd.bus_no, - NULL AS dev_category_code, - mmd.category_code AS med_category_code, - mmd.chrgitm_lv, - mmd.manufacturer_text, - mmd.yb_no, - mmd.wb_str, - mmd.py_str, - mmd.unit_code, - mmd.min_unit_code, - mmd.part_percent, - mmd.approval_number, - mm.dose_form_code, - mm.total_volume, - acid.price AS sale_price, - acid.id AS charge_item_def_id, - acidd.amount AS purchase_price, - al."name" AS location_name, - al2."name" AS location_store_name, - as2."name" AS supplier_name - FROM wor_inventory_item wii - LEFT JOIN med_medication_definition mmd - ON wii.item_id = mmd.id - AND mmd.delete_flag = '0' - LEFT JOIN med_medication mm - ON mmd.id = mm.medication_def_id - AND mm.delete_flag = '0' - LEFT JOIN adm_charge_item_definition acid - ON wii.item_id = acid.instance_id - AND acid.delete_flag = '0' - LEFT JOIN adm_charge_item_def_detail acidd - ON acid.id = acidd.definition_id - AND acidd.condition_value = wii.lot_number - AND acidd.delete_flag = '0' - LEFT JOIN adm_location al - ON wii.location_id = al.id - AND al.delete_flag = '0' - LEFT JOIN adm_location al2 - ON wii.location_store_id = al2.id - AND al2.delete_flag = '0' - LEFT JOIN adm_supplier as2 - ON wii.supplier_id = as2.id - AND as2.delete_flag = '0' - WHERE wii.item_table = #{medMedicationDefinition} - AND acidd.condition_code = #{lotNumberCost} - AND wii.delete_flag = '0' - UNION - SELECT wii.id AS inventory_id, - wii.production_date, - wii.expiration_date, - (wii.expiration_date::date - CURRENT_DATE) AS remaining_days, - wii.inventory_status_enum, - wii.location_id, - wii.location_store_id, - wii.lot_number, - wii.quantity, - wii.supplier_id, - wii.tenant_id, - #{admDeviceDefinition} AS item_table, - add2."name" AS item_name, - add2.bus_no, - add2.category_code AS dev_category_code, - NULL AS med_category_code, - add2.chrgitm_lv, - add2.manufacturer_text, - add2.yb_no, - add2.wb_str, - add2.py_str, - add2.unit_code, - add2.min_unit_code, - add2.part_percent, - add2.approval_number, - NULL AS dose_form_code, - add2.size AS total_volume, - acid.price AS sale_price, - acid.id AS charge_item_def_id, - acidd.amount AS purchase_price, - al."name" AS location_name, - al2."name" AS location_store_name, - as2."name" AS supplier_name - FROM wor_inventory_item wii - LEFT JOIN adm_device_definition add2 - ON wii.item_id = add2.id - AND add2.delete_flag = '0' - LEFT JOIN adm_charge_item_definition acid - ON wii.item_id = acid.instance_id - AND acid.delete_flag = '0' - LEFT JOIN adm_charge_item_def_detail acidd - ON acid.id = acidd.definition_id - AND acidd.condition_code = #{lotNumberCost} - AND acidd.condition_value = wii.lot_number - AND acidd.delete_flag = '0' - LEFT JOIN adm_location al - ON wii.location_id = al.id - AND al.delete_flag = '0' - LEFT JOIN adm_location al2 - ON wii.location_store_id = al2.id - AND al2.delete_flag = '0' - LEFT JOIN adm_supplier as2 - ON wii.supplier_id = as2.id - AND as2.delete_flag = '0' - WHERE wii.item_table = #{admDeviceDefinition} - AND acidd.condition_code = #{lotNumberCost} - AND wii.delete_flag = '0') AS ii - ${ew.customSqlSegment} - ORDER BY ii.py_str - - - diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml index ba09e1e8..248df887 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml @@ -40,13 +40,9 @@ T1.item_table, T1.purpose_type_enum, T1.tenant_id, -<<<<<<< HEAD - T1.category_enum -======= T1.category_enum, T1.purpose_location_id, sum(T1.total_price) AS total_amount ->>>>>>> v1.3 FROM wor_supply_request AS T1 WHERE type_enum = #{purchaseInventory} AND T1.delete_flag = '0' @@ -61,12 +57,8 @@ T1.item_table, T1.purpose_type_enum, T1.tenant_id, -<<<<<<< HEAD - T1.category_enum -======= T1.category_enum, T1.purpose_location_id ->>>>>>> v1.3 ORDER BY T1.bus_no desc ) AS T2 ${ew.customSqlSegment} @@ -92,32 +84,17 @@ T2.part_percent, T2.manufacturer_text, T3.total_volume, -<<<<<<< HEAD - T5."name" AS practitioner_name, - T6."name" AS purpose_location_name, - T6."id" AS purpose_location_id, - T7."name" AS purpose_location_store_name, - T1.supplier_id AS supplierId, - T10."name" AS supplier_name, -======= T5."name" AS practitioner_name, T6."name" AS purpose_location_name, T6."id" AS purpose_location_id, T7."name" AS purpose_location_store_name, ->>>>>>> v1.3 T1.occurrence_time, (SELECT SUM(T9.quantity) FROM wor_inventory_item T9 WHERE T9.item_id = T1.item_id -<<<<<<< HEAD - AND T9.location_id = T1.purpose_location_id - ) AS total_quantity, - T10."name" AS supplier_name -======= AND T9.location_id = T1.purpose_location_id) AS total_quantity, T10."name" AS supplier_name, sdt.dict_label AS measurementUnitCode_dictText ->>>>>>> v1.3 FROM wor_supply_request T1 INNER JOIN med_medication_definition T2 ON T1.item_id = T2.id @@ -132,11 +109,7 @@ ON T1.purpose_location_id = T6.id AND T6.delete_flag = '0' LEFT JOIN adm_location T7 -<<<<<<< HEAD - ON T1.purpose_location_store_id = T7.id -======= ON T1.purpose_location_store_id = T7.id ->>>>>>> v1.3 AND T7.delete_flag = '0' LEFT JOIN wor_inventory_item T9 ON T1.item_id = T9.item_id @@ -145,11 +118,8 @@ LEFT JOIN adm_supplier T10 ON T1.supplier_id = T10.id AND T10.delete_flag = '0' -<<<<<<< HEAD -======= LEFT JOIN sys_dict_data sdt ON sdt.dict_value = T1.unit_code AND dict_type = 'unit_code' ->>>>>>> v1.3 WHERE T1.bus_no = #{busNo} AND T1.delete_flag = '0' UNION @@ -172,42 +142,15 @@ T8.id AS item_id, T8.part_percent, T8.manufacturer_text, -<<<<<<< HEAD - T8."size" AS total_volume, - T5."name" AS practitioner_name, - T6."name" AS purpose_location_name, - T6."id" AS purpose_location_id, - T7."name" AS purpose_location_store_name, - T1.supplier_id AS supplierId, - T10."name" AS supplier_name, -======= T8."size" AS total_volume, T5."name" AS practitioner_name, T6."name" AS purpose_location_name, T6."id" AS purpose_location_id, T7."name" AS purpose_location_store_name, ->>>>>>> v1.3 T1.occurrence_time, (SELECT SUM(T9.quantity) FROM wor_inventory_item T9 WHERE T9.item_id = T1.item_id -<<<<<<< HEAD - AND T9.location_id = T1.purpose_location_id - ) AS total_quantity, - T10."name" AS supplier_name - FROM wor_supply_request T1 - INNER JOIN adm_device_definition T8 - ON T1.item_id = T8.id - AND T8.delete_flag = '0' - LEFT JOIN adm_practitioner T5 - ON T1.practitioner_id = T5.id - AND T5.delete_flag = '0' - LEFT JOIN adm_location T6 - ON T1.purpose_location_id = T6.id - AND T6.delete_flag = '0' - LEFT JOIN adm_location T7 - ON T1.purpose_location_store_id = T7.id -======= AND T9.location_id = T1.purpose_location_id) AS total_quantity, T10."name" AS supplier_name, sdt.dict_label AS measurementUnitCode_dictText @@ -223,24 +166,16 @@ AND T6.delete_flag = '0' LEFT JOIN adm_location T7 ON T1.purpose_location_store_id = T7.id ->>>>>>> v1.3 AND T7.delete_flag = '0' LEFT JOIN wor_inventory_item T9 ON T1.item_id = T9.item_id AND T1.purpose_location_id = T9.location_id -<<<<<<< HEAD - AND T9.delete_flag = '0' - LEFT JOIN adm_supplier T10 - ON T1.supplier_id = T10.id - AND T10.delete_flag = '0' -======= AND T9.delete_flag = '0' LEFT JOIN adm_supplier T10 ON T1.supplier_id = T10.id AND T10.delete_flag = '0' LEFT JOIN sys_dict_data sdt ON sdt.dict_value = T1.unit_code AND dict_type = 'unit_code' ->>>>>>> v1.3 WHERE T1.bus_no = #{busNo} AND T1.delete_flag = '0' @@ -284,19 +219,11 @@ LEFT JOIN adm_location T6 ON T1.purpose_location_id = T6.id LEFT JOIN adm_location T7 -<<<<<<< HEAD - ON T1.purpose_location_store_id = T7.id - LEFT JOIN wor_inventory_item T9 - ON T1.item_id = T9.item_id - AND T1.purpose_location_id = T9.location_id - WHERE T1.purpose_location_id = #{locationId} -======= ON T1.purpose_location_store_id = T7.id LEFT JOIN wor_inventory_item T9 ON T1.item_id = T9.item_id AND T1.purpose_location_id = T9.location_id WHERE T1.purpose_location_id = #{locationId} ->>>>>>> v1.3 AND T1.status_enum = #{statusEnum} AND T1.type_enum IN @@ -343,19 +270,11 @@ LEFT JOIN adm_location T6 ON T1.purpose_location_id = T6.id LEFT JOIN adm_location T7 -<<<<<<< HEAD - ON T1.purpose_location_store_id = T7.id - LEFT JOIN wor_inventory_item T9 - ON T1.item_id = T9.item_id - AND T1.purpose_location_id = T9.location_id - WHERE T1.purpose_location_id = #{locationId} -======= ON T1.purpose_location_store_id = T7.id LEFT JOIN wor_inventory_item T9 ON T1.item_id = T9.item_id AND T1.purpose_location_id = T9.location_id WHERE T1.purpose_location_id = #{locationId} ->>>>>>> v1.3 AND T1.status_enum = #{statusEnum} AND T1.type_enum IN diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml index 3b1b3822..2b82ad60 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml @@ -147,48 +147,6 @@ T2.apply_time, T2.practitioner_id, T2.tenant_id, -<<<<<<< HEAD - T2.supplier_id, - T2.purpose_location_id, - T2.total_amount - FROM (SELECT T1.bus_no AS supply_bus_no, - T1.status_enum, - T1.type_enum, - T1.approver_id, - T1.approval_time, - T1.applicant_id, - T1.apply_time, - T1.practitioner_id, - T1.tenant_id, - T1.supplier_id, - T1.purpose_location_id, - SUM ( T1.total_price ) as total_amount - FROM wor_supply_request AS T1 - LEFT JOIN adm_supplier T3 - ON T3.id = T1.supplier_id - AND T3.delete_flag = '0' - LEFT JOIN adm_location T4 - ON T4.id = T1.purpose_location_id - AND T4.delete_flag = '0' - WHERE T1.status_enum IN (#{approval},#{agree},#{reject}) - AND T1.type_enum IN (#{productBatchTransfer},#{productTransfer},#{productReturn},#{productStocktaking}, - #{productBatchStocktaking},#{purchaseInventory},#{lossReportForm},#{issueInventory},#{returnIssue}) - AND T1.delete_flag = '0' - GROUP BY - T1.bus_no, - T1.status_enum, - T1.type_enum, - T1.approver_id, - T1.approval_time, - T1.applicant_id, - T1.apply_time, - T1.practitioner_id, - T1.tenant_id, - T1.summary_id, - T1.supplier_id, - T1.purpose_location_id - ORDER BY T1.apply_time desc -======= T2.purpose_location_id, CASE WHEN T2.type_enum IN (#{purchaseInventory}, #{productReturn}) THEN T2.supplier_id @@ -231,7 +189,6 @@ T1.tenant_id, T1.purpose_location_id ORDER BY T1.apply_time desc ->>>>>>> v1.3 ) AS T2 ${ew.customSqlSegment} diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml index b4d57d4b..a14229d4 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml @@ -77,10 +77,6 @@ T1.unit_price, T1.total_price, mmr.prescription_no, -<<<<<<< HEAD - mmr.prescription_no, -======= ->>>>>>> v1.3 mmr.method_code, mmr.rate_code, mmr.dose, diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml index c76d24e6..1ae14842 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml @@ -95,18 +95,7 @@ T13.charge_item_ids, T13.id AS payment_id, ai.picture_url AS picture_url, -<<<<<<< HEAD - T8.birth_date AS birth_date, - T14.create_time AS return_date, - T14.return_reason AS return_reason, - T15.name AS operator_name, - T15.id AS operator_id, - T14.display_amount AS refund_amount, - T6.contract_no AS contract_no, - T16.refund_method AS refund_method -======= T8.birth_date AS birth_date ->>>>>>> v1.3 FROM adm_encounter AS T1 LEFT JOIN adm_organization AS T2 ON T1.organization_id = T2.ID AND T2.delete_flag = '0' LEFT JOIN adm_healthcare_service AS T3 ON T1.service_type_id = T3.ID AND T3.delete_flag = '0' diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml index 14c2830f..8358fa85 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml @@ -335,34 +335,6 @@ \ No newline at end of file diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml index be9e2231..b443069f 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml @@ -48,15 +48,7 @@ T1.create_time AS register_time, T1.reception_time AS reception_time, T1.organization_id AS org_id, -<<<<<<< HEAD - T8.bus_no AS bus_no, - CASE - WHEN T9.patient_id IS NOT NULL THEN 1 - ELSE 0 - END AS allergy_history_flag -======= T8.bus_no AS bus_no ->>>>>>> v1.3 FROM adm_encounter AS T1 LEFT JOIN adm_organization AS T2 ON T1.organization_id = T2.ID AND T2.delete_flag = '0' LEFT JOIN adm_healthcare_service AS T3 ON T1.service_type_id = T3.ID AND T3.delete_flag = '0' diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml index 4ebd70e2..f6109295 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml @@ -239,11 +239,7 @@ ON wsr.source_location_id = al.id AND al.delete_flag = '0' WHERE wsr.delete_flag = '0' -<<<<<<< HEAD - AND wsd.status_enum IN (#{inProgress}, #{completed}) -======= AND wsd.status_enum IN (#{preparation}, #{completed}) ->>>>>>> v1.3 AND wsr.type_enum = #{summaryDispense} GROUP BY wsr.tenant_id, wsr.bus_no , @@ -264,11 +260,8 @@ mmd.unit_code , mmd.min_unit_code , mmd.part_percent , -<<<<<<< HEAD -======= mmd.manufacturer_text, mmd.category_code, ->>>>>>> v1.3 mm.total_volume , wsr.lot_number, wsr.item_quantity diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/NurseBillingAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/NurseBillingAppMapper.xml index b94751f1..f024a2dc 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/NurseBillingAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/NurseBillingAppMapper.xml @@ -2,9 +2,6 @@ -<<<<<<< HEAD - -======= ->>>>>>> v1.3 \ No newline at end of file diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/OrgDeviceStockTakeAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/OrgDeviceStockTakeAppMapper.xml index b3541002..ad46fb0d 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/OrgDeviceStockTakeAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/OrgDeviceStockTakeAppMapper.xml @@ -62,9 +62,6 @@ AND T7.delete_flag = '0' LEFT JOIN adm_charge_item AS T8 ON T1.id = T8.service_id AND T8.delete_flag = '0' -<<<<<<< HEAD - WHERE T1.delete_flag = '0') AS ii -======= LEFT JOIN adm_encounter AS T9 ON T1.encounter_id = T9.id AND T9.delete_flag = '0' WHERE T1.delete_flag = '0' @@ -72,7 +69,6 @@ AND T1.status_enum = #{requestStatus} AND T2.status_enum = #{dispenseStatus} AND T8.status_enum = #{chargeItemStatus}) AS ii ->>>>>>> v1.3 ${ew.customSqlSegment} diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfStudentListAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfStudentListAppMapper.xml index d5423258..74b02ea6 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfStudentListAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfStudentListAppMapper.xml @@ -64,8 +64,6 @@ ORDER BY T1.id DESC) AS T ${ew.customSqlSegment} -<<<<<<< HEAD -======= ->>>>>>> v1.3 \ No newline at end of file diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml index 6eae3374..2ad7bfdb 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml @@ -34,12 +34,8 @@ AND T4.refund_device_id IS NULL AND T4.delete_flag = '0' WHERE T1.class_enum = #{amb} -<<<<<<< HEAD - AND T3.status_enum IN (#{completed},#{cancelled}) -======= AND (T3.status_enum IN (#{completed},#{cancelled}) OR T4.status_enum IN (#{completed},#{cancelled})) ->>>>>>> v1.3 AND T1.delete_flag = '0' GROUP BY T1.tenant_id, T1.id, diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml index d7ba1d9a..96c62d52 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml @@ -53,11 +53,7 @@ FROM fin_payment_reconciliation t LEFT JOIN adm_patient patient ON patient.id = t.patient_id LEFT JOIN adm_practitioner pra ON pra.id = t.enterer_id -<<<<<<< HEAD - LEFT JOIN adm_invoice invoice ON invoice.reconciliation_id = t.id -======= LEFT JOIN adm_invoice invoice ON invoice.reconciliation_id = t.id AND invoice.delete_flag = '0' ->>>>>>> v1.3 LEFT JOIN adm_encounter enc ON enc.id = t.enterer_id WHERE 1 = 1 AND t.delete_flag = '0' diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml index e12f1af0..93c61a41 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml @@ -4,195 +4,6 @@ - SELECT ii.tenant_id, - ii.bus_no,--单据号 - ii.request_id,--供应请求id - ii.delivery_id,--供应发放id - ii.item_table,--项目表 - ii.item_name,--项目名 - ii.item_id,--项目id - ii.total_volume,--规格 - ii.lot_number,--批号 - ii.quantity,--请求数 - ii.unit_code,--单位 - ii.max_unit_code,--常规单位 - ii.min_unit_code,--最小单位 - ii.source_location_id,--发放地点 - ii.source_location_name, - ii.org_id,--申请科室 - ii.org_name, - ii.applicant_id,--领药人 - ii.applicant_name, - ii.apply_time,--申请时间 - ii.status_enum,--状态 - ii.patient_info --患者信息 - FROM (SELECT T1.tenant_id, - T1.bus_no,--单据号 - T1.id AS request_id,--供应请求id - T2.id AS delivery_id,--供应发放id - T1.item_table,--项目表 - T3.name AS item_name,--项目名 - T1.item_id,--项目id - T4.total_volume,--规格 - T1.lot_number,--批号 - T1.item_quantity AS quantity,--请求数 - T1.unit_code,--单位 - T3.unit_code AS max_unit_code,--常规单位 - T3.min_unit_code,--最小单位 - T1.source_location_id,--发放地点 - T5.name AS source_location_name, - T1.purpose_location_id AS org_id,--申请科室 - T6.name AS org_name, - T1.applicant_id,--领药人 - T7.name AS applicant_name, - T1.apply_time,--申请时间 - T1.status_enum,--状态 - STRING_AGG(CONCAT(T11.name, ' : ', T12.inpatient_bed), ',' ORDER BY T11.name, - T12.inpatient_bed) AS patient_info -- 患者信息 - FROM wor_supply_request T1 - LEFT JOIN wor_supply_delivery AS T2 - ON T2.request_id = T1.id - AND T2.delete_flag = '0' - LEFT JOIN med_medication_definition AS T3 - ON T1.item_id = T3.id - AND T3.delete_flag = '0' - LEFT JOIN med_medication AS T4 - ON T3.id = T4.medication_def_id - AND T4.delete_flag = '0' - LEFT JOIN adm_location AS T5 - ON T1.source_location_id = T5.id - AND T5.delete_flag = '0' - LEFT JOIN adm_organization AS T6 - ON T1.purpose_location_id = T6.id - AND T6.delete_flag = '0' - LEFT JOIN adm_practitioner AS T7 - ON T1.applicant_id = T7.id - AND T7.delete_flag = '0' - LEFT JOIN (SELECT id, - encounter_id, - patient_id - FROM (SELECT id, - encounter_id, - patient_id, - ROW_NUMBER() OVER (PARTITION BY encounter_id ORDER BY id) AS rn - FROM med_medication_dispense - WHERE delete_flag = '0') t - WHERE rn = 1) AS T8 - ON CONCAT(',', T2.based_on_ids, ',') LIKE CONCAT('%,', T8.id, ',%') - LEFT JOIN (SELECT STRING_AGG(T10.NAME, '_' ORDER BY T10.bus_no) AS inpatient_bed, T9.encounter_id - FROM adm_encounter_location T9 - LEFT JOIN adm_location AS T10 - ON T10.id = T9.location_id - AND T10.delete_flag = '0' - WHERE T9.status_enum = '2' - AND T9.delete_flag = '0' - GROUP BY T9.encounter_id) AS T12 ON T8.encounter_id = T12.encounter_id - LEFT JOIN adm_patient AS T11 - ON T11.id = T8.patient_id - AND T11.delete_flag = '0' - WHERE T1.item_table = 'med_medication_definition' - AND T1.type_enum = 23 - AND T1.category_enum = 21 - AND T1.delete_flag = '0' - GROUP BY T1.tenant_id, - T1.bus_no, - T1.id, - T2.id, - T1.item_table, - T3.name, - T1.item_id, - T4.total_volume, - T1.lot_number, - T1.item_quantity, - T1.unit_code, - T3.unit_code, - T3.min_unit_code, - T1.source_location_id, - T5.name, - T1.purpose_location_id, - T6.name, - T1.applicant_id, - T7.name, - T1.apply_time, - T1.status_enum - ) AS ii - ${ew.customSqlSegment} - - - -======= ->>>>>>> v1.3 diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml index 4969699f..cf4e2a22 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml @@ -66,44 +66,6 @@ ii.reception_time, ii.start_time, ii.status_enum -<<<<<<< HEAD - FROM ( SELECT T1.tenant_id, - T1.id AS encounter_id, - T1.bus_no AS encounter_no, - T1.reception_time, - T1.organization_id AS department_id, - T1.class_enum, - T2.gender_enum, - T2.name AS patient_name, - T2.wb_str AS patient_wb_str, - T2.py_str AS patient_py_str, - T2.id_card, - T2.birth_date, - T3.name AS department_name, - T4.status_enum - FROM adm_encounter AS T1 - INNER JOIN adm_patient AS T2 - ON T1.patient_id = T2.id - AND T2.delete_flag = '0' - LEFT JOIN adm_organization AS T3 - ON T1.organization_id = T3.id - AND T3.delete_flag = '0' - INNER JOIN med_medication_dispense AS T4 - ON T4.encounter_id = T1.id - AND T4.delete_flag = '0' - INNER JOIN med_medication_request AS T5 - ON T4.med_req_id = T5.id - AND T5.delete_flag = '0' - WHERE - T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared}) - - - T4.status_enum IN (#{inProgress},#{preparation},#{prepared}) - - - T4.status_enum = #{completed} - -======= FROM ( SELECT T1.tenant_id, T1.id AS encounter_id, T1.bus_no AS encounter_no, @@ -142,7 +104,6 @@ T4.status_enum = #{completed} ->>>>>>> v1.3 ) AS ii ${ew.customSqlSegment} GROUP BY ii.encounter_id, @@ -162,125 +123,6 @@ ORDER BY ii.reception_time, ii.start_time DESC -<<<<<<< HEAD - SELECT ii.department_name, ii.doctor_id, @@ -430,7 +272,6 @@ AND T14.inventory_status_enum = #{active} ORDER BY prescription_no DESC ->>>>>>> v1.3 ) AS ii ${ew.customSqlSegment} diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml index ea684035..1774a420 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml @@ -236,10 +236,6 @@ T3.service_table = #{WOR_SERVICE_REQUEST} LEFT JOIN adm_organization AS ao ON ao.ID = T1.org_id AND ao.delete_flag = '0' WHERE T1.delete_flag = '0' AND T1.generate_source_enum = #{generateSourceEnum} -<<<<<<< HEAD - AND T1.based_on_table is null -======= ->>>>>>> v1.3 AND T1.parent_id IS NULL AND T1.encounter_id = #{encounterId} diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml index 794b2f0d..21644a67 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml @@ -210,168 +210,6 @@ @@ -875,6 +713,5 @@ T5.yb_type, T5.type_code, T8.trade_type; ->>>>>>> v1.3 \ No newline at end of file diff --git a/openhis-server-new/openhis-common/pom.xml b/openhis-server-new/openhis-common/pom.xml index c9f57d3a..7b6194aa 100644 --- a/openhis-server-new/openhis-common/pom.xml +++ b/openhis-server-new/openhis-common/pom.xml @@ -30,18 +30,12 @@ com.core core-admin -<<<<<<< HEAD com.core core-common compile -======= - 0.0.1-SNAPSHOT - - ->>>>>>> v1.3 diff --git a/openhis-server-new/openhis-domain/pom.xml b/openhis-server-new/openhis-domain/pom.xml index 62989f65..09fd85d8 100644 --- a/openhis-server-new/openhis-domain/pom.xml +++ b/openhis-server-new/openhis-domain/pom.xml @@ -30,14 +30,6 @@ -<<<<<<< HEAD - - org.projectlombok - lombok - - -======= ->>>>>>> v1.3 com.alibaba fastjson @@ -54,15 +46,6 @@ openhis-common 0.0.1-SNAPSHOT -<<<<<<< HEAD - - - com.core - core-common - - -======= ->>>>>>> v1.3 com.opencsv opencsv diff --git a/openhis-ui-vue3/package.json b/openhis-ui-vue3/package.json index d27ef695..7457de83 100644 --- a/openhis-ui-vue3/package.json +++ b/openhis-ui-vue3/package.json @@ -21,16 +21,9 @@ "dependencies": { "@element-plus/icons-vue": "^2.3.2", "@vueup/vue-quill": "1.2.0", -<<<<<<< HEAD - "@vueuse/core": "^11.0.0", - "area-data": "^5.0.6", - "axios": "^1.7.0", - "chart.js": "^4.5.1", -======= "@vueuse/core": "10.6.1", "axios": "0.27.2", "china-division": "^2.7.0", ->>>>>>> v1.3 "d3": "^7.9.0", "dayjs": "^1.11.19", "decimal.js": "^10.5.0", @@ -61,17 +54,6 @@ "vue-router": "^4.3.0" }, "devDependencies": { -<<<<<<< HEAD - "@vitejs/plugin-vue": "^5.0.0", - "@vue/compiler-sfc": "^3.5.25", - "sass": "^1.97.1", - "sass-loader": "^16.0.6", - "unplugin-auto-import": "^0.19.0", - "unplugin-vue-setup-extend-plus": "^1.0.0", - "vite": "^7.3.0", - "vite-plugin-compression": "^0.5.1", - "vite-plugin-svg-icons": "^2.0.1" -======= "@types/node": "^25.0.1", "@vitejs/plugin-vue": "4.5.0", "@vue/compiler-sfc": "3.3.9", @@ -83,6 +65,5 @@ "vite-plugin-compression": "0.5.1", "vite-plugin-svg-icons": "2.0.1", "vue-tsc": "^3.1.8" ->>>>>>> v1.3 } } diff --git a/openhis-ui-vue3/src/api/public.js b/openhis-ui-vue3/src/api/public.js index 4679fb2f..3caa3b3b 100644 --- a/openhis-ui-vue3/src/api/public.js +++ b/openhis-ui-vue3/src/api/public.js @@ -99,17 +99,6 @@ import axios from 'axios'; const env = import.meta.env.MODE; export function invokeYbPlugin5001(data) { -<<<<<<< HEAD -if(env == 'development'){ - return axios.create( - { - // axios中请求配置有baseURL选项，表示请求URL公共部分 - baseURL: '/ybplugin',//ybplugin - // 超时 - timeout: 60000 - } - ).post('/api/data/', data); -======= return axios .create({ // axios中请求配置有baseURL选项，表示请求URL公共部分 @@ -120,7 +109,6 @@ if(env == 'development'){ .post('http://localhost:5001/api/data/', data); } // } ->>>>>>> v1.3 export function invokeYbPlugin5000(data) { return axios @@ -128,15 +116,7 @@ export function invokeYbPlugin5000(data) { // axios中请求配置有baseURL选项，表示请求URL公共部分 baseURL: '', // 超时 -<<<<<<< HEAD - timeout: 60000 - } - ).post('http://localhost:5000/api/data/', data); -} -} -======= timeout: 60000, }) .post('http://localhost:5000/api/data/', data); } ->>>>>>> v1.3 diff --git a/openhis-ui-vue3/src/layout/components/Sidebar/index.vue b/openhis-ui-vue3/src/layout/components/Sidebar/index.vue index 92f73395..958984a4 100644 --- a/openhis-ui-vue3/src/layout/components/Sidebar/index.vue +++ b/openhis-ui-vue3/src/layout/components/Sidebar/index.vue @@ -1,34 +1,5 @@ - - -======= - ->>>>>>> v1.3 diff --git a/openhis-ui-vue3/src/template/inHosptialCommunicate.vue b/openhis-ui-vue3/src/template/inHosptialCommunicate.vue index d40ca3d9..1da556ab 100644 --- a/openhis-ui-vue3/src/template/inHosptialCommunicate.vue +++ b/openhis-ui-vue3/src/template/inHosptialCommunicate.vue @@ -22,35 +22,12 @@ -<<<<<<< HEAD - -======= - ->>>>>>> v1.3 -<<<<<<< HEAD - - -
- - 岁 -
- - - - - - - - - - -=======
@@ -67,7 +44,6 @@ ->>>>>>> v1.3 -<<<<<<< HEAD - - - - - -======= ->>>>>>> v1.3 @@ -108,11 +76,6 @@

三、病情与诊断

-<<<<<<< HEAD - -======= - ->>>>>>> v1.3 -<<<<<<< HEAD - -======= - ->>>>>>> v1.3
-<<<<<<< HEAD - -======= - ->>>>>>> v1.3

四、治疗与检查计划

-<<<<<<< HEAD - -======= - ->>>>>>> v1.3 -<<<<<<< HEAD - - -======= ->>>>>>> v1.3

六、签署确认

-<<<<<<< HEAD -
-=======
->>>>>>> v1.3
请填写患者或家属签字
 -<<<<<<< HEAD - - - - - -======= ->>>>>>> v1.3 - - -======= style="width: 100%" /> ->>>>>>> v1.3
请填写沟通医师签字
 -<<<<<<< HEAD - -======= - ->>>>>>> v1.3 >>>>>> v1.3 />
@@ -298,9 +213,6 @@ -======= - ->>>>>>> v1.3 diff --git a/openhis-ui-vue3/src/template/outpatientMedicalRecord.vue b/openhis-ui-vue3/src/template/outpatientMedicalRecord.vue index 8835ccd5..5c04c871 100644 --- a/openhis-ui-vue3/src/template/outpatientMedicalRecord.vue +++ b/openhis-ui-vue3/src/template/outpatientMedicalRecord.vue @@ -1,29 +1,15 @@ @@ -226,15 +217,11 @@ import { deletePharmacyDepartment, } from './components/pharmacyDepartment'; const { proxy } = getCurrentInstance(); -<<<<<<< HEAD -const { med_category_code } = proxy.useDict('med_category_code'); -======= const { distribution_category_code, med_category_code, device_category_code } = proxy.useDict( 'distribution_category_code', 'med_category_code', 'device_category_code' ); ->>>>>>> v1.3 import { nextTick } from 'vue'; const diagnosisTreatmentList = ref([]); diff --git a/openhis-ui-vue3/src/views/basicmanage/warehouseLocation/components/api.js b/openhis-ui-vue3/src/views/basicmanage/warehouseLocation/components/api.js index b8c0f185..f401b794 100644 --- a/openhis-ui-vue3/src/views/basicmanage/warehouseLocation/components/api.js +++ b/openhis-ui-vue3/src/views/basicmanage/warehouseLocation/components/api.js @@ -36,12 +36,8 @@ export function updateWarehouse(data) { // 删除 export function deleteWarehouse(data) { return request({ -<<<<<<< HEAD - url: '/base-data-manage/location/location', -======= // url: '/base-data-manage/location/location?locationId=' + data.locationId, url: '/base-data-manage/location/location?busNo=' + data.busNo, ->>>>>>> v1.3 method: 'delete', params: { locationId: data.locationId, diff --git a/openhis-ui-vue3/src/views/basicmanage/warehouseLocation/index.vue b/openhis-ui-vue3/src/views/basicmanage/warehouseLocation/index.vue index 06c428b6..248fbace 100644 --- a/openhis-ui-vue3/src/views/basicmanage/warehouseLocation/index.vue +++ b/openhis-ui-vue3/src/views/basicmanage/warehouseLocation/index.vue @@ -292,38 +292,12 @@ function submitForm() { // 删除 function handelDelete(data) { -<<<<<<< HEAD - proxy.$modal.confirm('是否确认删除该仓库位置?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - loading.value = true; - deleteWarehouse({ locationId: data.id, busNo: data.busNo }).then((res) => { - if (res.code === 200) { - proxy.$modal.msgSuccess('删除成功'); - getPageList(); - } else { - // 检查错误信息是否与药品数据关联有关 - if (res.msg && res.msg.includes('药品')) { - proxy.$modal.msgError('该仓库名称已有药品信息请核对确认'); - } else { - proxy.$modal.msgError('删除失败：' + (res.msg || '未知错误')); - } - } - }).catch(() => { - proxy.$modal.msgError('删除失败'); - }).finally(() => { - loading.value = false; - }); -======= loading.value = true; console.log(data, 'data'); deleteWarehouse({ busNo: data.busNo }).then((res) => { proxy.$modal.msgSuccess('操作成功'); loading.value = false; getPageList(); ->>>>>>> v1.3 }); } // // 停用 diff --git a/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue b/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue index e8d74842..76cabeec 100644 --- a/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue +++ b/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue @@ -757,11 +757,7 @@ const transformFormData = (form) => { ybNo, title, comment, -<<<<<<< HEAD - practitionerId, -======= busNo, ->>>>>>> v1.3 } = form.value; return { @@ -779,11 +775,7 @@ const transformFormData = (form) => { appointmentRequiredFlag, extraDetails, comment, -<<<<<<< HEAD - practitionerId, -======= busNo, ->>>>>>> v1.3 }, chargeItemDefinitionFormData: { id, @@ -822,11 +814,7 @@ const transformFormEditData = (form) => { ybNo, title, comment, -<<<<<<< HEAD - practitionerId, -======= busNo, ->>>>>>> v1.3 } = form.value; return { @@ -844,11 +832,7 @@ const transformFormEditData = (form) => { appointmentRequiredFlag, extraDetails, comment, -<<<<<<< HEAD - practitionerId, -======= busNo, ->>>>>>> v1.3 }, }; }; diff --git a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue index 742e42e9..5c362f44 100644 --- a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue +++ b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue @@ -94,14 +94,6 @@ v-model="form.unitCode" clearable filterable -<<<<<<< HEAD - remote - reserve-keyword - :remote-method="handleUnitCodeSearch" - :loading="unitCodeLoading" - @focus="handleUnitCodeFocus" -======= ->>>>>>> v1.3 @change="handleUnitCodeChange" :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2" > @@ -269,11 +261,7 @@ clearable filterable style="width: 240px" -<<<<<<< HEAD - :disabled="form.isEditInfoDisable === 1" -======= :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2" ->>>>>>> v1.3 > { - console.log(response, 'response查询部门下拉树结构'); -======= locationTreeSelect({ formList: '11,16' }).then((response) => { ->>>>>>> v1.3 locationOptions.value = response.data.records; }); } diff --git a/openhis-ui-vue3/src/views/catalog/device/index.vue b/openhis-ui-vue3/src/views/catalog/device/index.vue index 0705d648..3c6bb2e1 100644 --- a/openhis-ui-vue3/src/views/catalog/device/index.vue +++ b/openhis-ui-vue3/src/views/catalog/device/index.vue @@ -103,12 +103,7 @@ :data="deviceList" @selection-change="handleSelectionChange" width="90%" -<<<<<<< HEAD - /> - -======= > ->>>>>>> v1.3 >>>>>> v1.3 /> >>>>>> v1.3 /> ->>>>>>> v1.3 -<<<<<<< HEAD -
- -=======
->>>>>>> v1.3 @@ -724,8 +688,4 @@ function printCharge(row) { :deep(.el-table__body) tr:hover td.no-hover-column { background-color: inherit !important; } -<<<<<<< HEAD -======= - ->>>>>>> v1.3 diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue index 18bd604d..5044f000 100644 --- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue +++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue @@ -166,16 +166,6 @@ const props = defineProps({ type: Object, default: undefined, }, -<<<<<<< HEAD - medfee_paymtd_code: { - type: Array, - default: () => [], - }, - feeType: { - type: String, - default: '', - } -======= orgId: { type: String, default: '', @@ -184,7 +174,6 @@ const props = defineProps({ type: String, default: '', }, ->>>>>>> v1.3 }); const { proxy } = getCurrentInstance(); diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js index 17f3ccd8..18f158eb 100644 --- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js +++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js @@ -228,38 +228,6 @@ export function gerPreInfo(userMaessage) { return request({ url: '/yb-request/per-info', method: 'post', -<<<<<<< HEAD - params: userMaessage - }) -} - -/** - * 根据就诊卡号查询挂号记录 - * 注意：此接口可能不存在，实际使用getOutpatientRegistrationCurrent接口 - * 保留此函数以便将来使用，目前使用getOutpatientRegistrationCurrent替代 - */ -export function getRegistrationByCardNo(query) { - // 如果后端提供了专门的接口，可以取消注释使用 - // return request({ - // url: '/charge-manage/register/encounter-by-card', - // method: 'get', - // params: query - // }) - // 暂时使用现有的接口 - return getOutpatientRegistrationCurrent(query); -} - -/** - * 补打挂号 - */ -export function reprintRegistration(data) { - return request({ - url: '/charge-manage/register/reprint', - method: 'post', - data: data - }) -} -======= params: userMaessage, }); } @@ -285,4 +253,3 @@ export function WxPayResult(data) { data: data, }); } ->>>>>>> v1.3 diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue index ecf3af61..ab8eb783 100644 --- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue +++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue @@ -10,10 +10,6 @@ -<<<<<<< HEAD - - -======= @@ -66,7 +62,6 @@ ->>>>>>> v1.3 -<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -======= ->>>>>>> v1.3 -<<<<<<< HEAD -======= ->>>>>>> v1.3 @@ -423,11 +340,7 @@ @@ -152,8 +128,6 @@ defineExpose({ queryList }); & + .scrollbar-item { margin-top: 8px; } -<<<<<<< HEAD -======= transition: all 0.3s ease; } .selected-history-item { @@ -164,7 +138,6 @@ defineExpose({ queryList }); color: #d9d9d9; cursor: not-allowed; opacity: 0.6; ->>>>>>> v1.3 } } } diff --git a/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/template.vue b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/template.vue index 54cbfdf1..fe155902 100644 --- a/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/template.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/template.vue @@ -9,19 +9,6 @@
-->
-<<<<<<< HEAD - - -
{{ item.name }} - - -
- -=======
@@ -31,7 +18,6 @@
->>>>>>> v1.3
@@ -41,19 +27,11 @@ diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/refundListDialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/refundListDialog.vue index 105ac014..85ce95b0 100644 --- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/refundListDialog.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/refundListDialog.vue @@ -59,17 +59,6 @@ -<<<<<<< HEAD - - - -======= ->>>>>>> v1.3 -<<<<<<< HEAD - 脚注： - - - - -======= ->>>>>>> v1.3
总金额：{{ @@ -474,13 +430,9 @@ import { calculateQuantityByDays, formatNumber } from '@/utils/his'; import Decimal from 'decimal.js'; import tcmdiagnosisDialog from './tcmdiagnosisDialog'; import { Delete, Minus } from '@element-plus/icons-vue'; -<<<<<<< HEAD - -======= import { ElMessage } from 'element-plus'; import printUtils, { PRINT_TEMPLATE } from '@/utils/printUtils'; import { advicePrint } from '@/api/public'; ->>>>>>> v1.3 const emit = defineEmits(['selectDiagnosis']); const total = ref(0); const queryParams = ref({}); @@ -494,10 +446,6 @@ const encounterId = ref(''); const accountId = ref(''); const encounterDiagnosisId = ref(''); -<<<<<<< HEAD -const tcmPrescriptionList = ref([ - { -======= let prescriptionIdCounter = 1; const generatePrescriptionId = () => { return `prescription_${Date.now()}_${prescriptionIdCounter++}`; @@ -506,7 +454,6 @@ const generatePrescriptionId = () => { const tcmPrescriptionList = ref([ { id: generatePrescriptionId(), ->>>>>>> v1.3 prescriptionList: [], conditionDefinitionId: '', accountId: '', @@ -526,35 +473,9 @@ const tcmPrescriptionList = ref([ const unitCodeList = ref([]); const adviceTableRef = ref([]); const organization = ref([]); -<<<<<<< HEAD -const conditionDefinitionId = ref(''); -const diagnosisName = ref(''); -const diagnosisInfo = ref({}); -const rateCode = ref(''); -const footNote = ref(''); -const decoctionMethod = ref(''); -const chineseHerbsDoseQuantity = ref(''); -const dispensePerDuration = ref(''); -const formulaName = ref(''); -const sufferingFlag = ref(false); -const methodCode = ref(''); -const loading = ref(false); -const rowRules = ref({ - conditionDefinitionId: [{ required: true, message: '请选择诊断', trigger: 'change' }], - minUnitQuantity: [{ required: true, message: '请输入单次剂量', trigger: 'change' }], - doseQuantity: [{ required: true, message: '请输入单次剂量单位', trigger: 'change' }], - quantity: [{ required: true, message: '请输入数量', trigger: 'change' }], - dispensePerDuration: [{ required: true, message: '请输入用药天数', trigger: 'change' }], - formulaName: [{ required: true, message: '请输入配方名称', trigger: 'change' }], - executeNum: [{ required: true, message: '请输入执行次数', trigger: 'change' }], - rateCode: [{ required: true, message: '请选择频次', trigger: 'change' }], - methodCode: [{ required: true, message: '请选择给药途径', trigger: 'change' }], - orgId: [{ required: true, message: '请选择执行科室', trigger: 'change' }], -======= const loading = ref(false); const rowRules = ref({ minUnitQuantity: [{ required: true, message: '请输入单次剂量', trigger: 'change' }], ->>>>>>> v1.3 }); const unitMap = ref({ dose: 'dose', @@ -584,39 +505,6 @@ const inputRefs = ref({}); // 存储输入框实例 const requiredProps = ref([]); // 存储必填项 prop 顺序 const totalAmount = ref(0); const tcmDianosis = ref(); -<<<<<<< HEAD -const { method_code, unit_code, rate_code, method_of_decocting_medicine,hjerbal_footnotes,distribution_category_code } = proxy.useDict( - 'method_code', - 'unit_code', - 'rate_code', - 'method_of_decocting_medicine', - 'hjerbal_footnotes', - 'distribution_category_code' -); - -const adviceTypeList = ref([ - { - label: '西药', - value: 1, - }, - { - label: '中成药', - value: 2, - }, - { - label: '耗材', - value: 3, - }, - { - label: '诊疗', - value: 4, - }, - { - label: '全部', - value: '', - }, -]); -======= const { method_code, unit_code, rate_code, distribution_category_code, dosage_instruction } = proxy.useDict( 'method_code', @@ -626,7 +514,6 @@ const { method_code, unit_code, rate_code, distribution_category_code, dosage_in 'dosage_instruction' ); ->>>>>>> v1.3 onMounted(() => { document.addEventListener('keydown', escKeyListener); }); @@ -652,64 +539,6 @@ function getList() { }); } -<<<<<<< HEAD -function getListInfo(addNewRow) { - // 确保isAdding变量存在 - if (typeof isAdding !== 'undefined') { - isAdding.value = false; - } - - // 确保有患者信息 - if (!props.patientInfo || !props.patientInfo.encounterId) { - console.error('患者信息不完整'); - return; - } - - getTcmAdviceList({ encounterId: props.patientInfo.encounterId }).then((res) => { - if (res && res.data && Array.isArray(res.data)) { - // 处理返回的数据 - if (res.data.length > 0) { - // 如果有数据，清空当前列表并重新添加 - tcmPrescriptionList.value = []; - - res.data.forEach((item) => { - try { - // 解析contentJson获取完整的医嘱数据 - const contentData = item.contentJson ? JSON.parse(item.contentJson) : {}; - - // 创建一个新的处方对象 - const newPrescription = { - ...item, - ...contentData, - // 确保关键显示字段存在 - adviceName: contentData.adviceName || item.adviceName || '', - quantity: contentData.quantity || item.quantity || '', - totalPrice: contentData.totalPrice || item.totalPrice || '', - diagnosisName: contentData.diagnosisName || item.diagnosisName || '', - positionName: contentData.positionName || item.positionName || '', - doseUnitCode_dictText: contentData.doseUnitCode_dictText || item.doseUnitCode_dictText || '', - chineseHerbsDoseQuantity: contentData.chineseHerbsDoseQuantity || item.chineseHerbsDoseQuantity || '', - prescriptionList: [contentData] - }; - - // 添加到处方列表 - tcmPrescriptionList.value.push(newPrescription); - } catch (error) { - console.error('解析医嘱数据失败:', error, '数据项:', item); - } - }); - } - - // 重新计算总金额 - handleTotalAmount(); - - if (props.activeTab == 'prescription' && addNewRow) { - handleAddMedicine(); - } - } else { - console.error('获取医嘱列表失败或数据格式错误:', res); - // 保持当前列表不变，不要清空 -======= async function getListInfo(addNewRow) { // 重置所有处方的添加状态 tcmPrescriptionList.value.forEach((prescription) => { @@ -785,28 +614,14 @@ async function getListInfo(addNewRow) { tcmPrescriptionList.value.accountId = contractList.value[0].accountId; if (props.activeTab == 'prescription' && addNewRow) { handleAddMedicine(0); ->>>>>>> v1.3 } }).catch(error => { console.error('获取医嘱列表异常:', error); // 保持当前列表不变，不要清空 }); -<<<<<<< HEAD - - tcmDiagnosisList.value = getFromDiagnosis(props.patientInfo.encounterId); - - getContract({ encounterId: props.patientInfo.encounterId }).then((res) => { - contractList.value = res?.data || []; - }).catch(error => { - console.error('获取合同信息失败:', error); - }); - - accountId.value = props.patientInfo.accountId || ''; -======= tcmDiagnosisList.value = getFromDiagnosis(props.patientInfo.encounterId); accountId.value = props.patientInfo.accountId; ->>>>>>> v1.3 } function getDiagnosisInfo() { @@ -822,11 +637,7 @@ function getDiagnosisInfo() { }); }); } -<<<<<<< HEAD - // 默认选择第一个诊断 -======= // 默认选择第一个诊断 ->>>>>>> v1.3 if (diagnosisList.value.length > 0) { const firstDiagnosis = diagnosisList.value[0]; tcmPrescriptionList.value.forEach((prescription) => { @@ -1156,18 +967,8 @@ function handleDelete(pIndex) { prescription.expandOrder = []; prescription.isAdding = false; adviceQueryParams.value.adviceType = undefined; -<<<<<<< HEAD - // 删除行会出现组号混乱的情况，所以这里重新更新标记 - const allPrescriptions = tcmPrescriptionList.value.flatMap(p => p.prescriptionList); - groupMarkers.value = getGroupMarkers(allPrescriptions); } - - -======= -} - ->>>>>>> v1.3 function handleNumberClick(item, index, pIndex) { const prescription = tcmPrescriptionList.value[pIndex]; prescription.prescriptionList[index].unitPrice = item.price; @@ -1247,117 +1048,6 @@ function handleSave(pIndex) { } // 单行处方保存 -<<<<<<< HEAD -function handleSaveSign(row, index) { - try { - // 直接执行保存逻辑，不再进行表单验证 - row.isEdit = false; - isAdding.value = false; - expandOrder.value = []; - - // 确保必要的字段有值 - if (props.patientInfo) { - row.patientId = props.patientInfo.patientId; - row.encounterId = props.patientInfo.encounterId; - } - - row.accountId = accountId.value || ''; - row.quantity = row.minUnitQuantity || 1; // 确保数量有值 - row.conditionId = conditionId.value || ''; - row.conditionDefinitionId = conditionDefinitionId.value || ''; - row.encounterDiagnosisId = encounterDiagnosisId.value || ''; - row.diagnosisName = diagnosisName.value || ''; - - // 计算单价 - if (row.unitCodeList && row.unitCode) { - const unitItem = row.unitCodeList.find((item) => item.value === row.unitCode); - if (unitItem?.type !== 'unit' && row.unitPrice) { - row.unitPrice = new Decimal(row.unitPrice).div(row.partPercent || 1).toFixed(2); - } - } - - // 计算总金额 - if (row.minUnitQuantity && row.unitPrice) { - row.totalPrice = new Decimal(row.minUnitQuantity).mul(row.unitPrice).toFixed(2); - } - - // 确保显示所需的字段都有值 - row.adviceName = row.adviceName || '未命名药品'; - row.positionName = row.positionName || '默认药房'; - - // 创建要保存的数据对象，避免循环引用 - const saveData = { - ...row, - // 排除可能导致循环引用的复杂对象 - unitCodeList: undefined, - stockList: undefined, - contentJson: undefined - }; - - // 序列化数据用于存储 - saveData.contentJson = JSON.stringify(saveData); - - // 只保存当前行的数据，而不是整个列表 - savePrescription({ adviceSaveList: [saveData] }).then((res) => { - if (res && res.code === 200) { - proxy.$modal.msgSuccess('保存成功'); - // 此处错误调用getListInfo，导致医嘱信息被覆盖，从而不显示。 - // getListInfo(true); - nextId.value = 1; - } else { - proxy.$modal.msgError('保存失败，请重试'); - console.error('保存失败响应:', res); - } - }).catch(error => { - console.error('保存处方失败:', error); - proxy.$modal.msgError('保存失败，请检查网络或联系管理员'); - }); - } catch (error) { - console.error('处理保存时出错:', error); - proxy.$modal.msgError('操作异常，请重试'); - } -} - - -function handleSaveBatch() { - // 收集所有需要保存的处方项目 - let saveList = []; - - // 遍历所有处方 - for (const prescription of tcmPrescriptionList.value) { - if (prescription.prescriptionList) { - // 检查处方是否有必填的付数 - if (!prescription.chineseHerbsDoseQuantity || prescription.chineseHerbsDoseQuantity == 0) { - proxy.$modal.msgWarning('请输入付数'); - return; - } - - // 收集该处方下需要保存的项目 - const itemsToSave = prescription.prescriptionList - .filter((item) => item.statusEnum == 1) - .map((item, index) => { - return { - ...item, - accountId: accountId.value, - conditionId: prescription.conditionId, - encounterDiagnosisId: prescription.encounterDiagnosisId, - conditionDefinitionId: prescription.conditionDefinitionId, - encounterId: props.patientInfo.encounterId, - patientId: props.patientInfo.patientId, - requestId: item.requestId, - groupId: item.groupId ? item.groupId : timestamp.toString(), - chineseHerbsDoseQuantity: prescription.chineseHerbsDoseQuantity, - dbOpType: item.requestId ? '2' : '1', - }; - }); - - // 将项目添加到保存列表 - saveList = saveList.concat(itemsToSave); - } - } - - // 检查是否有可保存的项目 -======= function handleSaveSign(row, index, pIndex) { const prescription = tcmPrescriptionList.value[pIndex]; const formRefName = 'formRef' + pIndex + '-' + index; @@ -1408,15 +1098,10 @@ function handleSaveBatch(pIndex) { dbOpType: item.requestId ? '2' : '1', }; }); ->>>>>>> v1.3 if (saveList.length == 0) { proxy.$modal.msgWarning('当前没有可保存医嘱'); return; } -<<<<<<< HEAD - - // 保存处方 -======= if ( prescription.chineseHerbsDoseQuantity == undefined || prescription.chineseHerbsDoseQuantity == 0 @@ -1424,22 +1109,11 @@ function handleSaveBatch(pIndex) { proxy.$modal.msgWarning('请输入付数'); return; } ->>>>>>> v1.3 saveTcmAdvice({ adviceSaveList: saveList }).then((res) => { if (res.code === 200) { proxy.$modal.msgSuccess('保存成功'); getListInfo(true); -<<<<<<< HEAD - - // 重置所有处方的nextId - tcmPrescriptionList.value.forEach(prescription => { - if (prescription.nextId) { - prescription.nextId = 1; - } - }); -======= prescription.nextId = 1; ->>>>>>> v1.3 } }); } @@ -1607,21 +1281,6 @@ function validateGroups(saveList) { return true; } -<<<<<<< HEAD - - - - - - - - - - - - - -======= async function handlePrint(pIndex) { const prescription = tcmPrescriptionList.value[pIndex]; const selectedRows = prescription.prescriptionList.filter((item) => item.check); @@ -1683,7 +1342,6 @@ async function handlePrint(pIndex) { ElMessage.error('中药处方打印失败: ' + error.message); } } ->>>>>>> v1.3 defineExpose({ getListInfo, getDiagnosisInfo }); @@ -1799,29 +1457,4 @@ defineExpose({ getListInfo, getDiagnosisInfo }); .add-icon:hover { background-color: #ecf5ff; } -<<<<<<< HEAD - -.delete-icon { - cursor: pointer; - border-radius: 50%; - padding: 4px; - transition: all 0.3s ease; -} - -.delete-icon:hover { - background-color: #fef0f0; -} - -.delete-icon.disabled-icon { - cursor: not-allowed; - color: #c0c4cc !important; - opacity: 0.6; -} - -.delete-icon.disabled-icon:hover { - background-color: transparent; -} -======= - ->>>>>>> v1.3 diff --git a/openhis-ui-vue3/src/views/doctorstation/index.vue b/openhis-ui-vue3/src/views/doctorstation/index.vue index 7e2eabe9..f1582dd8 100644 --- a/openhis-ui-vue3/src/views/doctorstation/index.vue +++ b/openhis-ui-vue3/src/views/doctorstation/index.vue @@ -15,11 +15,6 @@ -<<<<<<< HEAD - -======= ->>>>>>> v1.3
@@ -87,14 +81,6 @@ {{ Object.keys(patientInfo).length !== 0 ? patientInfo.patientName + -<<<<<<< HEAD - ' / ' + - patientInfo.age + - ' / ' + - patientInfo.genderEnum_enumText + - ' / ' + - patientInfo.contractName -======= ' / ' + patientInfo.age + ' / ' + @@ -105,29 +91,16 @@ patientInfo.phone + '/' + patientInfo.busNo ->>>>>>> v1.3 : '-' }} {{ Object.keys(patientInfo).length !== 0 ? formatDate(patientInfo.registerTime) : '-' }} -<<<<<<< HEAD - {{ - userStore.name - }} - - - 初诊 - 复诊 - - -======= {{ userStore.nickName }} ->>>>>>> v1.3 完诊 @@ -140,31 +113,11 @@ 处方单 -<<<<<<< HEAD - - 办理住院 - - - 取消接诊 - -======= 办理住院 ->>>>>>> v1.3
-<<<<<<< HEAD - - - - -======= --> ->>>>>>> v1.3 -<<<<<<< HEAD - -======= ->>>>>>> v1.3 @@ -226,14 +174,6 @@ -<<<<<<< HEAD - - - -======= ->>>>>>> v1.3
\ No newline at end of file diff --git a/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordFirst.vue b/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordFirst.vue index 39af38a6..d62639f5 100644 --- a/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordFirst.vue +++ b/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordFirst.vue @@ -542,210 +542,6 @@ const sexOptions = gend; // 入院途径 const admissionOptions = adm_way; -<<<<<<< HEAD -// 表单数据 -const formData = reactive({ - //组织机构代码 - medins_orgcode: '', - - //医疗付费方式 - - - //健康卡号 - - - //姓名--患者姓名 - patient_name: '', - - //性别--患者性别 - gend: '', - - //出生日期 - brdy: '', - - //年龄 - age: '', - - //国籍 - ntly: '', - - //籍贯 - napl: '', - - //民族 - naty: '', - - //身份证号 - certNo: '', - - //户口地址 - resd_addr:'', - - //工作单位及地址 - empr_addr: '', - - //联系人姓名 - coner_name: '', - - //关系 - patn_rlts: '', - - //地址 - addr: '', - - //电话 - tel: '', - - //第几次住院 - patn_ipt_cnt: '', - - //住院号 mdtrtsn - ipt_no: '', - - //病案号 - medcasno: '', - - //入院途径 - adm_way: '', - - //入院时间 - adm_time: '', - - //入院科室 adm_dept_codg - adm_dept_name: '', - - //病房 入院病房 - adm_ward: '', - - //实际住院天数 - act_ipt_days: '', - - //主要诊断----不确定 - diag_code: '', - - //其他诊断 - - - //是否输血 - - - //血型 - - - //Rh - - - //药物过敏史 - - - //科主任 科主任姓名--deptort_name: - deptort: '', - - //主任(副主任)医师 - chfdr_name: '', - - //主治医师 主诊医师姓名--chfpdr_name - atddr_no: '', - - //住院医师 住院医师姓名--ipdr_name - ipdr_code: '', - - //责任护士 责任护士姓名--resp_nurs_name - resp_nurs_code: '', - - //住院总医师 - - - //实习医师 - intn_dr_name: '', - - //病案质量 病案质量名称--medcas_qlt_name - medcas_qlt_code: '', - - //编码员 - codr_name: '', - - //质控日期 - qltctrl_date: '', - - - - - - - - - - - - - - - - - - - - - - hospital: { - orgCode: '41275054-7', - paymentMethod: '城乡居民基本医疗保险' - }, - patient: { - healthCardNo: '', - name: '', - gender: '', - birthDate: '', - age: '', - nationality: '中国', - nativePlace: '', - ethnicity: '汉族', - idCardNo: '', - householdAddress: '', - workUnit: '', - contactName: '', - contactRelation: '', - contactAddress: '', - contactPhone: '' - }, - admission: { - times: 1, - hospitalNo: '', - recordNo: '', - channel: '', - admitTime: '', - department: '', - ward: '', - confirmDate: '', - dischargeTime: '', - dischargeDepartment: '', - dischargeWard: '', - hospitalDays: '' - }, - diagnosis: { - mainDiagnosis: '', - otherDiagnosis: '' - }, - medicalInfo: { - bloodTransfusion: '2', - bloodType: '', - rhType: '', - drugAllergy: '1' - }, - doctorInfo: { - departmentDirector: '', - chiefPhysician: '', - attendingPhysician: '', - residentPhysician: '', - chargeNurse: '', - chiefResident: '', - intern: '', - recordQuality: '1', - coder: '', - qualityControlDate: '' - } -======= // 是否输血 const bloodOption = sys_yes_no; // 血型 @@ -806,7 +602,6 @@ const rules = ref({ name: [{ required: true, message: '请选择诊断', trigger: 'change' }], medTypeCode: [{ required: true, message: '请选择诊断类型', trigger: 'change' }], diagSrtNo: [{ required: true, message: '请输入诊断序号', trigger: 'change' }], ->>>>>>> v1.3 }); diff --git a/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordSecond.vue b/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordSecond.vue index 8c26c03f..8e874f04 100644 --- a/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordSecond.vue +++ b/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordSecond.vue @@ -1,23 +1,11 @@ -<<<<<<< HEAD - -======= ->>>>>>> v1.3 diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/api.js b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/api.js index c91b7ded..bc151ca3 100644 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/api.js +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/api.js @@ -100,17 +100,6 @@ export function transferOrganization(data) { return request({ url: '/reg-doctorstation/special-advice/transfer-organization-orders', method: 'post', -<<<<<<< HEAD - data: data - }) -} - - - - - -======= data: data, }); } ->>>>>>> v1.3 diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/applicationFormBottomBtn.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/applicationFormBottomBtn.vue index 87a8f391..a7d0f917 100644 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/applicationFormBottomBtn.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/applicationFormBottomBtn.vue @@ -56,10 +56,6 @@
-======= const submitApplicationForm = async () => { if (!formRef.value) return; try { @@ -153,4 +126,3 @@ defineExpose({ openDialog, }); ->>>>>>> v1.3 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 03afebbc..18c23a6f 100644 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue @@ -65,11 +65,7 @@ 长期 临时 -<<<<<<< HEAD - -======= ->>>>>>> v1.3 -<<<<<<< HEAD - - 转科 - 出院 -======= 护理状态 刷新数据 ->>>>>>> v1.3
>>>>>> v1.3 row-key="uniqueKey" border @cell-click="clickRow" @row-dblclick="clickRowDb" v-loading="loading" :expand-row-keys="expandOrder" -<<<<<<< HEAD - > - - - - - - - - - - - -