wangyizhe/his
3
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

提交merge1.3

Browse Source
This commit is contained in:
chenqi
2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openhis-server-new/core-system/pom.xml
View File

@@ -23,20 +23,12 @@
<groupId>com.core</groupId>
<artifactId>core-common</artifactId>
</dependency>
<<<<<<< HEAD
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
=======
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
>>>>>>> v1.3
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>

10
openhis-server-new/openhis-application/src/main/resources/application-prd.yml
View File

@@ -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
# 数据库索引

4
openhis-server-new/openhis-application/src/main/resources/application.yml
View File

@@ -49,11 +49,7 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
<<<<<<< HEAD
active: dev
=======
active: prod # (天翼云)cloud （本地测试）test （本地）local （生产）prod (农大)
>>>>>>> v1.3
# 文件上传
servlet:
multipart:

290
openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailAppMapper.xml
View File

@@ -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
</select>
<select id="selectProductDetailsPageX"
resultType="com.openhis.web.inventorymanage.dto.ProductDetailPageDto">
SELECT DISTINCT ii.inventory_id,
ii.production_date,
ii.expiration_date,
ii.remaining_days,
ii.inventory_status_enum,
ii.location_id,
ii.location_store_id,
ii.lot_number,
ii.quantity,
ii.supplier_id,
ii.item_table,
ii.item_name,
ii.bus_no,
ii.dev_category_code,
ii.med_category_code,
ii.chrgitm_lv,
ii.manufacturer_text,
ii.yb_no,
ii.wb_str,
ii.py_str,
ii.unit_code,
ii.min_unit_code,
ii.part_percent,
ii.approval_number,
ii.dose_form_code,
ii.total_volume,
ii.sale_price,
ii.charge_item_def_id,
ii.purchase_price,
ii.location_name,
ii.location_store_name,
ii.supplier_name,
sdd.dict_label AS unitCode_dictText,
sdd2.dict_label AS minUnitCode_dictText,
sdd3.dict_label AS devCategoryCode_dictText,
sdd4.dict_label AS doseFormCode_dictText,
sdd5.dict_label AS medCategoryCode_dictText
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
LEFT JOIN sys_dict_data sdd ON ii.unit_code = sdd.dict_value AND sdd.dict_type = 'unit_code'
LEFT JOIN sys_dict_data sdd2 ON ii.min_unit_code = sdd2.dict_value AND sdd2.dict_type = 'unit_code'
LEFT JOIN sys_dict_data sdd3 ON ii.dev_category_code = sdd3.dict_value AND sdd3.dict_type = 'device_category_code'
LEFT JOIN sys_dict_data sdd4 ON ii.dose_form_code = sdd4.dict_value AND sdd4.dict_type = 'dose_form_code'
LEFT JOIN sys_dict_data sdd5 ON ii.med_category_code = sdd5.dict_value AND sdd5.dict_type = 'med_category_code'
${ew.customSqlSegment}
ORDER BY ii.py_str
=======
FROM (
(SELECT wii.id AS inventory_id,
wii.production_date,
@@ -708,6 +419,5 @@
WHERE delete_flag = '0'
) AS ii
${ew.customSqlSegment}
>>>>>>> v1.3
</select>
</mapper>

81
openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
View File

@@ -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'
</select>
@@ -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
<foreach collection="typeEnum" item="item" separator="," open="(" close=")">
@@ -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
<foreach collection="typeEnum" item="item" separator="," open="(" close=")">

43
openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml
View File

@@ -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}
</select>

4
openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
View File

@@ -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,

11
openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
View File

@@ -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'

115
openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml
View File

@@ -335,34 +335,6 @@
<select id="selectPrescriptionPrintInfo" resultMap="PrescriptionPrintInfoMap">
SELECT ae.yb_class_enum AS encounter_yb_class,
<<<<<<< HEAD
mmr.prescription_no ,
fc.contract_name ,
ap."name" AS patient_name,
ap.gender_enum ,
ap.birth_date ,
ae.bus_no AS encounter_no,
ao."name" AS department_name,
ccd."name" AS condition_name,
ap.phone ,
mmr.req_authored_time AS req_time,
ap2."name" AS doctor_name,
ap3."name" AS dispense_doctor_name,
ap4."name" AS charge_doctor_name,
ap5."name" AS preparer_doctor_name,
mmd2."name" AS item_name,
mm.total_volume ,
mmr.dose ,
mmr.method_code ,
aci.unit_price ,
aci.total_price ,
mmr.quantity,
mmr.rate_code ,
mmr.unit_code ,
mmr.dose_unit_code,
mmr.sort_number,
mmr.group_id
=======
mmr.prescription_no ,
fc.contract_name ,
ap."name" AS patient_name,
@@ -394,7 +366,6 @@
ap.address,
ae.patient_id,
mmd2.basic_flag
>>>>>>> v1.3
FROM med_medication_request mmr
LEFT JOIN med_medication_dispense mmd
ON mmd.med_req_id = mmr.id
@@ -450,48 +421,6 @@
</select>
<select id="selectTreatmentPrintInfo" resultMap="TreatmentPrintInfoMap">
SELECT ae.yb_class_enum AS encounter_yb_class,
<<<<<<< HEAD
fc.contract_name ,
ap."name" AS patient_name,
ap.gender_enum ,
ap.birth_date ,
ae.bus_no AS encounter_no,
ao."name" AS department_name,
ap.phone ,
ae.reception_time AS req_time,
ap2."name" AS doctor_name,
aci.unit_price ,
aci.total_price,
wdr.quantity ,
wdr.unit_code ,
add2."name" AS item_name
FROM wor_device_request wdr
LEFT JOIN adm_device_definition add2
ON wdr.device_def_id = add2.id
AND add2.delete_flag = '0'
LEFT JOIN adm_charge_item aci
ON aci.service_id = wdr.id
AND aci.delete_flag = '0'
LEFT JOIN adm_encounter ae
ON wdr.encounter_id = ae.id
AND ae.delete_flag = '0'
LEFT JOIN adm_patient ap
ON ae.patient_id = ap.id
AND ap.delete_flag = '0'
LEFT JOIN adm_organization ao
ON ao.id = ae.organization_id
AND ao.delete_flag = '0'
LEFT JOIN adm_account aa
ON ae.id = aa.encounter_id
AND aa.encounter_flag = 1
AND aa.delete_flag = '0'
LEFT JOIN fin_contract fc
ON aa.contract_no = fc.bus_no
AND fc.delete_flag = '0'
LEFT JOIN adm_practitioner ap2
ON ap2.id = wdr.requester_id
AND ap2.delete_flag = '0'
=======
fc.contract_name ,
ap."name" AS patient_name,
ap.gender_enum ,
@@ -535,7 +464,6 @@
LEFT JOIN adm_practitioner ap2
ON ap2.id = wdr.requester_id
AND ap2.delete_flag = '0'
>>>>>>> v1.3
WHERE wdr.delete_flag = '0'
AND wdr.id IN
<foreach collection="requestIds" item="requestId" separator="," open="(" close=")">
@@ -543,48 +471,6 @@
</foreach>
UNION
SELECT ae.yb_class_enum AS encounter_yb_class,
<<<<<<< HEAD
fc.contract_name ,
ap."name" AS patient_name,
ap.gender_enum ,
ap.birth_date ,
ae.bus_no AS encounter_no,
ao."name" AS department_name,
ap.phone ,
ae.reception_time AS req_time,
ap2."name" AS doctor_name,
aci.unit_price ,
aci.total_price,
wsr.quantity ,
wsr.unit_code ,
wad."name" AS item_name
FROM wor_service_request wsr
LEFT JOIN wor_activity_definition wad
ON wsr.activity_id = wad.id
AND wad.delete_flag = '0'
LEFT JOIN adm_charge_item aci
ON aci.service_id = wsr.id
AND aci.delete_flag = '0'
LEFT JOIN adm_encounter ae
ON wsr.encounter_id = ae.id
AND ae.delete_flag = '0'
LEFT JOIN adm_patient ap
ON ae.patient_id = ap.id
AND ap.delete_flag = '0'
LEFT JOIN adm_organization ao
ON ao.id = ae.organization_id
AND ao.delete_flag = '0'
LEFT JOIN adm_account aa
ON ae.id = aa.encounter_id
AND aa.encounter_flag = 1
AND aa.delete_flag = '0'
LEFT JOIN fin_contract fc
ON aa.contract_no = fc.bus_no
AND fc.delete_flag = '0'
LEFT JOIN adm_practitioner ap2
ON ap2.id = wsr.requester_id
AND ap2.delete_flag = '0'
=======
fc.contract_name ,
ap."name" AS patient_name,
ap.gender_enum ,
@@ -628,7 +514,6 @@
LEFT JOIN adm_practitioner ap2
ON ap2.id = wsr.requester_id
AND ap2.delete_flag = '0'
>>>>>>> v1.3
WHERE wsr.delete_flag = '0'
AND wsr.id IN
<foreach collection="requestIds" item="requestId" separator="," open="(" close=")">

3
openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
View File

@@ -5,8 +5,6 @@
resultType="com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto">
SELECT
<<<<<<< HEAD
=======
T3.id,
T3.category_code,
T3.bus_no,
@@ -37,7 +35,6 @@
FROM
(
SELECT
>>>>>>> v1.3
T1.id,
T1.category_code,
T1.bus_no,

23
openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
View File

@@ -41,12 +41,8 @@
abi.position_id,
abi.restricted_flag,
abi.restricted_scope,
<<<<<<< HEAD
abi.dosage_instruction
=======
abi.dosage_instruction,
abi.chrgitm_lv
>>>>>>> v1.3
from (
<if test="adviceTypes == null or adviceTypes.contains(1)">
(SELECT
@@ -87,12 +83,8 @@
T6.def_location_id AS position_id,
t1.restricted_flag AS restricted_flag,
t1.restricted_scope AS restricted_scope,
<<<<<<< HEAD
T1.dosage_instruction AS dosage_instruction
=======
T1.dosage_instruction AS dosage_instruction,
T1.chrgitm_lv as chrgitm_lv
>>>>>>> v1.3
FROM med_medication_definition AS t1
INNER JOIN med_medication AS T2 ON T2.medication_def_id = T1.ID
AND T2.delete_flag = '0' AND T2.status_enum = #{statusEnum}
@@ -164,12 +156,8 @@
T5.def_location_id AS position_id,
0 AS restricted_flag,
'' AS restricted_scope,
<<<<<<< HEAD
'' AS dosage_instruction
=======
'' AS dosage_instruction,
T1.chrgitm_lv as chrgitm_lv
>>>>>>> v1.3
FROM adm_device_definition AS T1
LEFT JOIN adm_supplier AS T2
ON T2.ID = T1.supply_id
@@ -235,12 +223,8 @@
T3.organization_id AS position_id,
0 AS restricted_flag,
'' AS restricted_scope,
<<<<<<< HEAD
'' AS dosage_instruction
=======
'' AS dosage_instruction,
T1.chrgitm_lv as chrgitm_lv
>>>>>>> v1.3
FROM wor_activity_definition AS T1
LEFT JOIN adm_charge_item_definition AS T2
ON T2.instance_id = T1.ID
@@ -543,10 +527,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.refund_service_id IS NULL
<if test="historyFlag == '0'.toString()">
@@ -620,8 +600,6 @@
AND tad.status_enum = #{status}
AND tad.type_code = #{typeCode}
AND tad.item_no = #{itemNo}
<<<<<<< HEAD
=======
</select>
<select id="getProofAndTestHistory" resultType="com.openhis.web.doctorstation.dto.ProofAndTestHistoryDto">
@@ -646,7 +624,6 @@
AND wsr.encounter_id = #{encounterId}
AND EXISTS ( SELECT 1 FROM wor_activity_definition AS wad WHERE wad.type_enum = #{typeEnum}
AND wad.ID = wsr.activity_id )
>>>>>>> v1.3
</select>
</mapper>

8
openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml
View File

@@ -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'

7
openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml
View File

@@ -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

4
openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/NurseBillingAppMapper.xml
View File

@@ -2,9 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.web.inhospitalnursestation.mapper.NurseBillingAppMapper">
<<<<<<< HEAD
=======
<select id="getInNurseBillingPage"
resultType="com.openhis.web.inhospitalnursestation.dto.InpatientAdviceDto">
SELECT ii.encounter_id,
@@ -303,5 +300,4 @@
) AS ii
${ew.customSqlSegment}
</select>
>>>>>>> v1.3
</mapper>

4
openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/OrgDeviceStockTakeAppMapper.xml
View File

@@ -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}
</select>

3
openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfStudentListAppMapper.xml
View File

@@ -64,8 +64,6 @@
ORDER BY T1.id DESC) AS T
${ew.customSqlSegment}
</select>
<<<<<<< HEAD
=======
<select id="getPatientBusNoList" resultType="com.openhis.web.nenu.dto.GfStudentPeisDto">
SELECT T1.bus_no as bus_no
, T.id_number as id_number
@@ -101,6 +99,5 @@
ORDER BY T.id DESC
LIMIT 1 OFFSET 0
</select>
>>>>>>> v1.3
</mapper>

4
openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml
View File

@@ -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,

4
openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml
View File

@@ -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'

190
openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
View File

@@ -4,195 +4,6 @@
<select id="selectAmbPractitionerDetailPage"
resultType="com.openhis.web.pharmacymanage.dto.MedDetailedAccountPageDto">
select A.outpatient_no,
<<<<<<< HEAD
A.prescription_no,
A.patient_name,
A.practitioner_id,
A.practitioner_name,
A.medication_name,
A.py_str,
A.bus_no,
A.dispense_no,
A.yb_no,
A.total_volume,
A.dispense_quantity,
A.dispense_price,
A.refund_quantity,
A.refund_price,
A.lot_number,
A.manufacturer_text,
A.supplier_name,
A.unit_code,
A.refund_unit_code,
A.dispense_time,
A.location_id,
A.item_table
from (
WITH refund_info AS (
SELECT mmr.refund_medicine_id,
mmd.dispense_quantity,
mmd.unit_code,
aci.total_price
FROM med_medication_dispense mmd
LEFT JOIN med_medication_request mmr
ON mmd.med_req_id = mmr.id
AND mmr.delete_flag = '0'
INNER JOIN adm_charge_item aci
ON aci.service_id = mmr.refund_medicine_id
AND aci.delete_flag = '0'
WHERE mmd.status_enum = #{refunded}
AND mmd.delete_flag = '0'
AND mmr.refund_medicine_id IS not null
),
refund_device_info AS (
SELECT wdr.refund_device_id,
wdd.dispense_quantity,
wdd.unit_code,
aci.total_price
FROM wor_device_dispense wdd
LEFT JOIN wor_device_request wdr
ON wdd.device_req_id = wdr.id
AND wdr.delete_flag = '0'
INNER JOIN adm_charge_item aci
ON aci.service_id = wdd.device_req_id
AND aci.delete_flag = '0'
WHERE wdd.status_enum = #{refunded}
AND wdd.delete_flag = '0'
AND wdr.refund_device_id IS not null
)
SELECT def."name" AS medication_name,
def.py_str,
def.bus_no,
def.yb_no,
def.manufacturer_text,
mmr.prescription_no,
ae.bus_no AS outpatient_no,
pat.name AS patient_name,
mm.total_volume,
mmd.unit_code,
mmd.bus_no AS dispense_no,
mmd.lot_number,
mmd.dispense_quantity,
mmd.encounter_id,
mmd.practitioner_id,
mmd.dispense_time,
ap.name AS practitioner_name,
mmd.location_id,
aci.total_price AS dispense_price,
ri.dispense_quantity AS refund_quantity,
ri.unit_code AS refund_unit_code,
ri.total_price AS refund_price,
wii.supplier_id,
sup.name AS supplier_name,
mmd.tenant_id,
#{medMedicationDefinition} AS item_table
FROM med_medication_dispense mmd
LEFT JOIN med_medication_request mmr
ON mmd.med_req_id = mmr.id
AND mmr.delete_flag = '0'
INNER JOIN adm_charge_item aci
ON aci.service_id = mmr.id
AND aci.delete_flag = '0'
LEFT JOIN med_medication_definition def
ON mmd.medication_id = def.id
AND def.delete_flag = '0'
LEFT JOIN med_medication mm
ON mm.medication_def_id = def.id
AND mm.delete_flag = '0'
LEFT JOIN wor_inventory_item wii
ON wii.item_id = mmd.medication_id
AND wii.lot_number = mmd.lot_number
AND wii.location_id = mmd.location_id
AND wii.delete_flag = '0'
LEFT JOIN refund_info AS ri
ON ri.refund_medicine_id = mmr.id
LEFT JOIN adm_location al
ON al.id = mmd.location_id
LEFT JOIN adm_practitioner ap
ON ap.id = mmd.practitioner_id
LEFT JOIN adm_patient pat
ON pat.id = mmd.patient_id
LEFT JOIN adm_encounter ae
ON ae.id = mmd.encounter_id
LEFT JOIN adm_supplier sup
ON sup.id = wii.supplier_id
WHERE mmd.status_enum = #{completed}
AND mmr.status_enum = #{agree}
<if test="flg != 1">
AND ae.class_enum = #{amb}
</if>
AND mmd.delete_flag = '0'
UNION
SELECT def."name" AS medication_name,
def.py_str,
def.bus_no,
def.yb_no,
def.manufacturer_text,
mmr.prescription_no,
ae.bus_no AS outpatient_no,
pat.name AS patient_name,
def.size AS total_volume,
mmd.unit_code,
mmd.bus_no AS dispense_no,
mmd.lot_number,
mmd.dispense_quantity,
mmd.encounter_id,
mmd.performer_id AS practitioner_id,
mmd.dispense_time,
ap.name AS practitioner_name,
mmd.location_id,
aci.total_price AS dispense_price,
ri.dispense_quantity AS refund_quantity,
ri.unit_code AS refund_unit_code,
ri.total_price AS refund_price,
wii.supplier_id,
sup.name AS supplier_name,
mmd.tenant_id,
#{admDeviceDefinition} AS item_table
FROM wor_device_dispense mmd
LEFT JOIN wor_device_request mmr
ON mmd.device_req_id = mmr.id
AND mmr.delete_flag = '0'
INNER JOIN adm_charge_item aci
ON aci.service_id = mmr.id
AND aci.delete_flag = '0'
LEFT JOIN adm_device_definition def
ON mmd.device_def_id = def.id
AND def.delete_flag = '0'
LEFT JOIN adm_device mm
ON mm.device_def_id = def.id
AND mm.delete_flag = '0'
LEFT JOIN wor_inventory_item wii
ON wii.item_id = mmd.device_def_id
AND wii.lot_number = mmd.lot_number
AND wii.location_id = mmd.location_id
AND wii.delete_flag = '0'
LEFT JOIN refund_device_info AS ri
ON ri.refund_device_id = mmr.id
LEFT JOIN adm_location al
ON al.id = mmd.location_id
LEFT JOIN adm_practitioner ap
ON ap.id = mmd.performer_id
LEFT JOIN adm_patient pat
ON pat.id = mmd.patient_id
LEFT JOIN adm_encounter ae
ON ae.id = mmd.encounter_id
LEFT JOIN adm_supplier sup
ON sup.id = wii.supplier_id
WHERE mmd.status_enum = #{completed}
AND mmr.status_enum = #{agree}
<if test="flg != 1">
AND ae.class_enum = #{amb}
</if>
AND mmd.delete_flag = '0'
) AS A
${ew.customSqlSegment}
<choose>
<when test="dispenseEnum == 1">
ORDER BY A.dispense_time DESC
</when>
<when test="dispenseEnum == 2">
=======
A.prescription_no,
A.patient_name,
A.practitioner_id,
@@ -417,7 +228,6 @@
ORDER BY A.dispense_time DESC
</when>
<when test="statisticalType == 2 || statisticalType ==4 || statisticalType ==6">
>>>>>>> v1.3
ORDER BY A.outpatient_no DESC, A.prescription_no DESC
</when>
</choose>

36
openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
View File

@@ -83,23 +83,6 @@
<when test="(medDispenseIdList != null and !medDispenseIdList.isEmpty())
or (devDispenseIdList != null and !devDispenseIdList.isEmpty())">
<if test="medDispenseIdList != null and !medDispenseIdList.isEmpty()">
<<<<<<< HEAD
SELECT
T1.id AS dispense_id,
T1.unit_code AS dispense_unit,
T1.quantity,
T1.location_id,
T1.lot_number,
T1.dispense_quantity,
T2.id AS inventory_id,
T2.unit_code AS inventory_unit_code,
T2.quantity AS inventory_quantity,
T2.inventory_status_enum,
T2.expiration_date,
T3.part_percent,
T3."name" AS item_name,
T3.id AS item_id
=======
SELECT T1.id AS dispense_id,
T1.unit_code AS dispense_unit,
T1.quantity,
@@ -117,7 +100,6 @@
T3.part_percent,
T3."name" AS item_name,
T1.medication_id AS item_id
>>>>>>> v1.3
FROM med_medication_dispense AS T1
INNER JOIN wor_inventory_item AS T2
ON T1.medication_id = T2.item_id
@@ -139,23 +121,6 @@
UNION
</if>
<if test="devDispenseIdList != null and !devDispenseIdList.isEmpty()">
<<<<<<< HEAD
SELECT
T4.id AS dispense_id,
T4.unit_code AS dispense_unit,
T4.quantity,
T4.location_id,
T4.lot_number,
T4.dispense_quantity,
T2.id AS inventory_id,
T2.unit_code AS inventory_unit_code,
T2.quantity AS inventory_quantity,
T2.inventory_status_enum,
T2.expiration_date,
T5.part_percent,
T5."name" AS item_name,
T5.id AS item_id
=======
SELECT T4.id AS dispense_id,
T4.unit_code AS dispense_unit,
T4.quantity,
@@ -173,7 +138,6 @@
T5.part_percent,
T5."name" AS item_name,
T4.device_def_id AS item_id
>>>>>>> v1.3
FROM wor_device_dispense AS T4
INNER JOIN wor_inventory_item AS T2
ON T4.device_def_id = T2.item_id

183
openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/SummaryDispenseMedicineMapper.xml
View File

@@ -1,187 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.web.pharmacymanage.mapper.SummaryDispenseMedicineMapper">
<<<<<<< HEAD
<select id="selectMedicationSummaryInfo" resultType="com.openhis.web.pharmacymanage.dto.MedicineSummaryDto">
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}
</select>
<select id="selectOrderInfo" resultType="com.openhis.web.pharmacymanage.dto.MedicineSummaryDto">
SELECT
li.bus_no,--单据号
li.request_id,--供应请求id
li.delivery_id,--供应发放id
li.item_table,--项目表
li.item_name,--项目名
li.item_id,--项目id
li.total_volume,--规格
li.lot_number,--批号
li.quantity,--请求数
li.unit_code,--单位
li.max_unit_code,--常规单位
li.min_unit_code,--最小单位
li.source_location_id,--发放地点
li.source_location_name,
li.org_id,--申请科室
li.org_name,
li.applicant_id,--领药人
li.applicant_name,
li.apply_time,--申请时间
li.status_enum--状态
FROM
(
SELECT
wsr.tenant_id,
wsr.bus_no,--单据号
wsd.request_id,--供应请求id
wsd.id AS delivery_id,--供应发放id
wsr.item_table,--项目表
mmd.name AS item_name,--项目名
wsr.item_id,--项目id
mm.total_volume,--规格
wsr.lot_number,--批号
wsr.item_quantity AS quantity,--请求数
wsr.unit_code,--单位
mmd.unit_code AS max_unit_code,--常规单位
mmd.min_unit_code,--最小单位
wsr.source_location_id,--发放地点
al.name AS source_location_name,
ao.id AS org_id,--申请科室
ao.name AS org_name,
wsr.applicant_id,--领药人
ap.name AS applicant_name,
wsr.apply_time,--申请时间
wsr.status_enum --状态
FROM
wor_supply_request AS wsr
LEFT JOIN adm_practitioner AS ap ON wsr.applicant_id = ap.ID
AND ap.delete_flag = '0'
LEFT JOIN wor_supply_delivery AS wsd ON wsd.request_id = wsr.ID
AND wsd.delete_flag = '0'
LEFT JOIN med_medication_definition AS mmd ON wsd.item_id = mmd.ID
AND mmd.delete_flag = '0'
LEFT JOIN med_medication AS mm ON mmd.ID = mm.medication_def_id
AND mm.delete_flag = '0'
LEFT JOIN adm_location AS al ON wsr.source_location_id = al.ID
AND al.delete_flag = '0'
LEFT JOIN adm_organization AS ao ON wsr.purpose_location_id = ao.ID
AND ao.delete_flag = '0'
WHERE wsr.delete_flag = '0'
) AS li
${ew.customSqlSegment}
</select>
=======
>>>>>>> v1.3
</mapper>

159
openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
View File

@@ -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 <if test="statusEnum == null">
T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared})
</if>
<if test="statusEnum == 3">
T4.status_enum IN (#{inProgress},#{preparation},#{prepared})
</if>
<if test="statusEnum == 4">
T4.status_enum = #{completed}
</if>
=======
FROM ( SELECT T1.tenant_id,
T1.id AS encounter_id,
T1.bus_no AS encounter_no,
@@ -142,7 +104,6 @@
<if test="statusEnum == 4">
T4.status_enum = #{completed}
</if>
>>>>>>> v1.3
) AS ii
${ew.customSqlSegment}
GROUP BY ii.encounter_id,
@@ -162,125 +123,6 @@
ORDER BY ii.reception_time,
ii.start_time DESC
</select>
<<<<<<< HEAD
<select id="selectMedicineDispenseOrderPage" resultType="com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto">
SELECT ii.department_name,
ii.doctor_id,
ii.doctor_name,
ii.item_type,
ii.condition_name,
ii.prescription_no,
ii.lot_number,
ii.request_id,
ii.tcm_flag,
ii.item_name,
ii.item_id,
ii.total_volume,
ii.unit_code,
ii.encounter_id,
ii.dose,
ii.status_enum,
ii.rate_code,
ii.location_id,
ii.method_code,
ii.dose_unit_code,
ii.dispense_per_quantity,
ii.dispense_per_duration,
ii.quantity,
ii.dispense_id,
ii.unit_price,
ii.total_price,
ii.dispense_doctor_name,
ii.location_name,
ii.encounter_bus_no,
ii.req_authored_time,
ii.skin_test_flag,
ii.group_id,
ii.manufacturer_text,
ii.trace_no
FROM ( SELECT T8."name" AS department_name,
T9.id AS doctor_id,
T9."name" AS doctor_name,
T3.category_code AS item_type,
T7."name" AS condition_name,
T2.prescription_no,
T2.lot_number,
T2.id AS request_id,
T2.tcm_flag,
T3."name" AS item_name,
T3.id AS item_id,
T4.total_volume,
T1.unit_code,
T1.encounter_id,
T1.dose,
T1.status_enum,
T2.rate_code,
T1.location_id,
T1.method_code,
T2.dose_unit_code,
T2.dispense_per_quantity,
T2.dispense_per_duration,
T1.quantity,
T1.id AS dispense_id,
T5.unit_price,
T5.total_price,
T10."name" AS dispense_doctor_name,
T13."name" AS location_name,
T6.bus_no AS encounter_bus_no,
T2.req_authored_time,
T3.skin_test_flag,
T2.group_id AS group_id,
T1.tenant_id,
T3.manufacturer_text,
T1.trace_no
FROM med_medication_dispense AS T1
LEFT JOIN med_medication_request AS T2
ON T1.med_req_id = T2.id
AND T2.delete_flag = '0'
LEFT JOIN med_medication_definition AS T3
ON T1.medication_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'
INNER JOIN adm_charge_item AS T5
ON T1.med_req_id = T5.service_id
AND T5.delete_flag = '0'
LEFT JOIN adm_encounter AS T6
ON T1.encounter_id = T6.id
AND T6.delete_flag = '0'
LEFT JOIN cli_condition AS T12
ON T2.condition_id = T12.id
AND T12.delete_flag = '0'
LEFT JOIN cli_condition_definition AS T7
ON T12.definition_id = T7.id
AND T7.delete_flag = '0'
LEFT JOIN adm_organization AS T8
ON T6.organization_id = T8.id
AND T8.delete_flag = '0'
LEFT JOIN adm_practitioner AS T9
ON T2.practitioner_id = T9.id
AND T9.delete_flag = '0'
LEFT JOIN adm_practitioner AS T10
ON T1.practitioner_id = T10.id
AND T10.delete_flag = '0'
LEFT JOIN adm_location AS T13
ON T1.location_id = T13.id
AND T13.delete_flag = '0'
WHERE T1.delete_flag = '0'
-- 因发药配药合并，前台只能看到待发药，已发药状态，但是后台配药发药状态都查
AND
<if test="dispenseStatus == null">
T1.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared})
</if>
<if test="dispenseStatus == 3">
T1.status_enum IN (#{inProgress},#{preparation},#{prepared})
</if>
<if test="dispenseStatus == 4">
T1.status_enum = #{completed}
</if>
ORDER BY prescription_no DESC
=======
<select id="selectMedicineDispenseOrderPage" resultMap="medicineDispenseOrderMap">
SELECT ii.department_name,
ii.doctor_id,
@@ -430,7 +272,6 @@
</if>
AND T14.inventory_status_enum = #{active}
ORDER BY prescription_no DESC
>>>>>>> v1.3
) AS ii
${ew.customSqlSegment}
</select>

4
openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
View File

@@ -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
<if test="historyFlag == '0'.toString()">
AND T1.encounter_id = #{encounterId}

163
openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml
View File

@@ -210,168 +210,6 @@
<!--门诊收入明细 -->
<select id="selectRevenueReportPage"
resultType="com.openhis.web.reportmanage.dto.ChargeReportPageDto">
<<<<<<< HEAD
SELECT T8.tenant_id,
T8.payment_id,
T8.charge_id,
T8.name, --姓名
T8.gender_enum, --性别
T8.birth_date, --出生日期
T8.id_card, --证件号
T8.yb_code, --医保号
T8.encounter_date, --就诊日期
T8.bus_no,--患者院内编码/病历号
T8.department_id,--科室
T8.department_name,--科室
T8.clinical_name,--项目名
T8.clinical_no, --项目编码
T8.ybNo,--医保码
T8.type, --类别
T8.issuer_id,--开单人
T8.issuer_name,--开单人
T8.payee_id,--收款人
T8.payee_name,--收款人
T8.number,--数量
T8.quantity_unit,--单位
T8.price,--单价
T8.total_price,--金额
T8.charge_time,-- 收费时间
T8.total_volume, --规格
T8.chrgitmLv,--医保等级
T8.clinical_type, --项目类型
T8.encounter_id
FROM (SELECT DISTINCT T1.tenant_id,
T1.id AS payment_id,
T4.id AS charge_id,
T15.name, --姓名
T15.gender_enum, --性别
T15.birth_date, --出生日期
T15.id_card, --证件号
T16.psn_no AS yb_code, --医保号
TO_CHAR(T2.reception_time, 'YYYY-MM-DD') AS encounter_date, --就诊日期
T2.bus_no, --患者院内编码/病历号
T3.id AS department_id,--科室
T3.name AS department_name,--科室
CASE
WHEN T5.instance_table = 'adm_device_definition' THEN T11.name
WHEN T5.instance_table = 'adm_healthcare_service' THEN T12.name
WHEN T5.instance_table = 'med_medication_definition' THEN T13.name
WHEN T5.instance_table = 'wor_activity_definition' THEN T14.name
ELSE NULL
END AS clinical_name, --项目名
CASE
WHEN T5.instance_table = 'adm_device_definition' THEN T11.bus_no
WHEN T5.instance_table = 'med_medication_definition' THEN T13.bus_no
WHEN T5.instance_table = 'wor_activity_definition' THEN T14.bus_no
ELSE NULL
END AS clinical_no, --项目编码
CASE
WHEN T5.instance_table = 'adm_device_definition' THEN T11.yb_no
WHEN T5.instance_table = 'adm_healthcare_service' THEN T12.yb_no
WHEN T5.instance_table = 'med_medication_definition' THEN T13.yb_no
WHEN T5.instance_table = 'wor_activity_definition' THEN T14.yb_no
ELSE NULL
END AS ybNo, --医保码
T5.yb_type AS type, --医保类别
T6.id AS issuer_id,--开单人
T6.name AS issuer_name,--开单人
T7.id AS payee_id,--收款人
T7.name AS payee_name,--收款人
T4.quantity_value AS number,--数量
T4.quantity_unit,--单位
T4.unit_price AS price,--单价
CASE
WHEN T1.status_enum = #{refundAll} THEN -T4.total_price
ELSE T4.total_price
END AS total_price,--金额
T1.bill_date AS charge_time,-- 收费时间
CASE
WHEN T5.instance_table = 'adm_device_definition' THEN T17.device_specifications
WHEN T5.instance_table = 'med_medication_definition' THEN T18.total_volume
ELSE NULL
END AS total_volume, --规格
CASE
WHEN T5.instance_table = 'adm_device_definition' THEN T11.chrgitm_lv
WHEN T5.instance_table = 'med_medication_definition' THEN T13.chrgitm_lv
WHEN T5.instance_table = 'wor_activity_definition' THEN T14.chrgitm_lv
ELSE NULL
END AS chrgitmLv,--医保等级
CASE
WHEN T5.instance_table = 'adm_device_definition' THEN #{device}
WHEN T5.instance_table = 'adm_healthcare_service' THEN #{register}
WHEN T5.instance_table = 'med_medication_definition' THEN #{medication}
WHEN T5.instance_table = 'wor_activity_definition' THEN #{activity}
ELSE NULL
END AS clinical_type, --项目类型
T1.encounter_id
FROM fin_payment_reconciliation T1
LEFT JOIN adm_encounter T2
ON T2.id = T1.encounter_id
AND T2.delete_flag = '0'
AND T2.class_enum = 2
LEFT JOIN adm_patient AS T15
ON T1.patient_id = T15.id
AND T15.delete_flag = '0'
LEFT JOIN yb_clinc_reg AS T16
ON T2.bus_no = T16.ipt_otp_no
LEFT JOIN adm_organization AS T3
ON T2.organization_id = T3.id
AND T3.delete_flag = '0'
LEFT JOIN adm_charge_item T4
ON CONCAT(',', T1.charge_item_ids, ',') LIKE CONCAT('%,', T4.id, ',%')
AND T4.delete_flag = '0'
LEFT JOIN adm_charge_item_definition T5
ON T4.definition_id = T5.id
AND T5.delete_flag = '0'
LEFT JOIN adm_device_definition T11
ON T5.instance_id = T11.id
AND T5.instance_table = 'adm_device_definition'
AND T11.delete_flag = '0'
LEFT JOIN adm_device T17
ON T11.id = T17.device_def_id
AND T17.delete_flag = '0'
LEFT JOIN adm_healthcare_service T12
ON T5.instance_id = T12.id
AND T5.instance_table = 'adm_healthcare_service'
AND T12.delete_flag = '0'
LEFT JOIN med_medication_definition T13
ON T5.instance_id = T13.id
AND T5.instance_table = 'med_medication_definition'
AND T13.delete_flag = '0'
LEFT JOIN med_medication T18
ON T13.id = T18.medication_def_id
AND T18.delete_flag = '0'
LEFT JOIN wor_activity_definition T14
ON T5.instance_id = T14.id
AND T5.instance_table = 'wor_activity_definition'
AND T14.delete_flag = '0'
LEFT JOIN adm_practitioner T6
ON T4.enterer_id = T6.id
AND T6.delete_flag = '0'
LEFT JOIN adm_practitioner T7
ON T1.enterer_id = T7.id
AND T7.delete_flag = '0'
<if test="statisticsFlg == 0 or statisticsFlg == 1">
INNER JOIN adm_account T19
ON T4.account_id = T19.id
AND T19.delete_flag = '0'
INNER JOIN fin_contract T20
ON T19.contract_no = T20.bus_no
AND T20.yb_flag = #{statisticsFlg}
AND T20.delete_flag = '0'
</if>
<if test="statisticsFlg == 3">
WHERE T1.status_enum = #{refundAll}
</if>
<if test="statisticsFlg != 3">
WHERE T1.status_enum IN (#{success}, #{refundAll})
</if>
AND T1.delete_flag = '0'
ORDER BY T2.bus_no,
T4.ID,
T1.bill_date) AS T8
${ew.customSqlSegment}
=======
<include refid="selectRevenueReportPage"/>
</select>
<!--门诊收入明细，不分页 -->
@@ -875,6 +713,5 @@
T5.yb_type,
T5.type_code,
T8.trade_type;
>>>>>>> v1.3
</select>
</mapper>

6
openhis-server-new/openhis-common/pom.xml
View File

@@ -30,18 +30,12 @@
<dependency>
<groupId>com.core</groupId>
<artifactId>core-admin</artifactId>
<<<<<<< HEAD
</dependency>
<dependency>
<groupId>com.core</groupId>
<artifactId>core-common</artifactId>
<scope>compile</scope>
</dependency>
=======
<version>0.0.1-SNAPSHOT</version>
</dependency>
>>>>>>> v1.3
</dependencies>
</project>

17
openhis-server-new/openhis-domain/pom.xml
View File

@@ -30,14 +30,6 @@
<dependencies>
<<<<<<< HEAD
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
=======
>>>>>>> v1.3
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
@@ -54,15 +46,6 @@
<artifactId>openhis-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<<<<<<< HEAD
<!-- 核心共通模块 -->
<dependency>
<groupId>com.core</groupId>
<artifactId>core-common</artifactId>
</dependency>
=======
>>>>>>> v1.3
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>