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

解决合并冲突

Browse Source
This commit is contained in:
chenqi
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

209
openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChangePriceRecordMapper.xml Normal file
View File

@@ -0,0 +1,209 @@
<?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.administration.mapper.ChangePriceRecordMapper">
<select id="searchMedChangePriceByBusNo" resultType="com.openhis.administration.dto.ChangePriceDataDto">
select md.name as itemName,
record.origin_buying_price as originBuyingPrice,
record.new_buying_price as newBuyingPrice,
record.origin_retail_price as originRetailPrice,
record.new_retail_price as newRetailPrice,
record.reason as reason,
record.bus_no as busNo,
record.unit_code as unitCode,
med.total_volume as totalVolume,
sum(record.item_quantity) as itemQuantity,
sum(record.difference_buying_price) as differenceBuyingPrice,
sum(record.difference_retail_price) as differenceRetailPrice
from adm_change_price_record record
left join med_medication_definition md on record.item_id = md.id
left join med_medication med on medication_def_id = md.id
where record.bus_no = #{busNo}
and record.item_category_enum = #{categoryEnum}
<if test="statusEnum != null">
and record.status_enum = #{statusEnum}
</if>
group by md.name, record.origin_buying_price, record.new_buying_price, record.origin_retail_price,
record.new_retail_price, record.reason, record.bus_no,record.unit_code,med.total_volume
</select>
<select id="searchMedChangePriceByItemId" resultType="com.openhis.administration.dto.ChangePriceDataDto">
select md.name as itemName,
record.origin_buying_price as originBuyingPrice,
record.new_buying_price as newBuyingPrice,
record.origin_retail_price as originRetailPrice,
record.new_retail_price as newRetailPrice,
record.reason as reason,
record.bus_no as busNo,
record.unit_code as unitCode,
med.total_volume as totalVolume,
sum(record.item_quantity) as itemQuantity,
sum(record.difference_buying_price) as differenceBuyingPrice,
sum(record.difference_retail_price) as differenceRetailPrice
from adm_change_price_record record
left join med_medication_definition md on record.item_id = md.id
left join med_medication med on medication_def_id = md.id
where record.item_id = #{itemId}
and record.item_category_enum = #{categoryEnum}
and record.status_enum = #{statusEnum}
group by md.name, record.origin_buying_price, record.new_buying_price, record.origin_retail_price,
record.new_retail_price, record.reason, record.bus_no,record.unit_code,med.total_volume
</select>
<select id="searchDeviceChangePriceByBusNo" resultType="com.openhis.administration.dto.ChangePriceDataDto">
select deivce.name as itemName,
record.origin_buying_price as originBuyingPrice,
record.new_buying_price as newBuyingPrice,
record.origin_retail_price as originRetailPrice,
record.new_retail_price as newRetailPrice,
record.reason as reason,
record.bus_no as busNo,
deivce.size as totalVolume,
sum(record.item_quantity) as itemQuantity,
sum(record.difference_buying_price) as differenceBuyingPrice,
sum(record.difference_retail_price) as differenceRetailPrice
from adm_change_price_record record
left join adm_device_definition deivce on record.item_id = deivce.id
where record.bus_no = #{busNo}
and record.item_category_enum = #{categoryEnum}
<if test="statusEnum != null">
and record.status_enum = #{statusEnum}
</if>
group by deivce.name, record.origin_buying_price, record.new_buying_price, record.origin_retail_price,
record.new_retail_price, record.reason, record.bus_no,deivce.size
</select>
<select id="searchDeviceChangePriceByItemId" resultType="com.openhis.administration.dto.ChangePriceDataDto">
select deivce.name as itemName,
record.origin_buying_price as originBuyingPrice,
record.new_buying_price as newBuyingPrice,
record.origin_retail_price as originRetailPrice,
record.new_retail_price as newRetailPrice,
record.reason as reason,
record.bus_no as busNo,
deivce.size as totalVolume,
sum(record.item_quantity) as itemQuantity,
sum(record.difference_buying_price) as differenceBuyingPrice,
sum(record.difference_retail_price) as differenceRetailPrice
from adm_change_price_record record
left join adm_device_definition deivce on record.item_id = deivce.id
where record.item_id = #{itemId}
and record.item_category_enum = #{categoryEnum}
and record.status_enum = #{statusEnum}
group by deivce.name, record.origin_buying_price, record.new_buying_price, record.origin_retail_price,
record.new_retail_price, record.reason, record.bus_no,deivce.size
</select>
<select id="searchActivityChangePriceByBusNo" resultType="com.openhis.administration.dto.ChangePriceDataDto">
select activity.name as itemName,
record.origin_buying_price as originBuyingPrice,
record.new_buying_price as newBuyingPrice,
record.origin_retail_price as originRetailPrice,
record.new_retail_price as newRetailPrice,
record.reason as reason,
record.bus_no as busNo,
sum(record.item_quantity) as itemQuantity,
sum(record.difference_buying_price) as differenceBuyingPrice,
sum(record.difference_retail_price) as differenceRetailPrice
from adm_change_price_record record
left join wor_activity_definition activity on record.item_id = activity.id
where record.bus_no = #{busNo}
and record.item_category_enum = #{categoryEnum}
<if test="statusEnum != null">
and record.status_enum = #{statusEnum}
</if>
group by activity.name, record.origin_buying_price, record.new_buying_price, record.origin_retail_price,
record.new_retail_price, record.reason, record.bus_no
</select>
<select id="searchActivityChangePriceByItemId" resultType="com.openhis.administration.dto.ChangePriceDataDto">
select activity.name as itemName,
record.origin_buying_price as originBuyingPrice,
record.new_buying_price as newBuyingPrice,
record.origin_retail_price as originRetailPrice,
record.new_retail_price as newRetailPrice,
record.reason as reason,
record.bus_no as busNo,
sum(record.item_quantity) as itemQuantity,
sum(record.difference_buying_price) as differenceBuyingPrice,
sum(record.difference_retail_price) as differenceRetailPrice
from adm_change_price_record record
left join wor_activity_definition activity on record.item_id = activity.id
where record.item_id = #{itemId}
and record.item_category_enum = #{categoryEnum}
and record.status_enum = #{statusEnum}
group by activity.name, record.origin_buying_price, record.new_buying_price, record.origin_retail_price,
record.new_retail_price, record.reason, record.bus_no
</select>
<select id="searchHealthChangePriceByBusNo" resultType="com.openhis.administration.dto.ChangePriceDataDto">
select hearlth.name as itemName,
org.name as orgName,
record.origin_buying_price as originBuyingPrice,
record.new_buying_price as newBuyingPrice,
record.origin_retail_price as originRetailPrice,
record.new_retail_price as newRetailPrice,
record.reason as reason,
record.bus_no as busNo,
sum(record.item_quantity) as itemQuantity,
sum(record.difference_buying_price) as differenceBuyingPrice,
sum(record.difference_retail_price) as differenceRetailPrice
from adm_change_price_record record
left join adm_healthcare_service hearlth on record.item_id = hearlth.id
left join adm_organization org on hearlth.offered_org_id = org.id
where record.bus_no = #{busNo}
and record.item_category_enum = #{categoryEnum}
<if test="statusEnum != null">
and record.status_enum = #{statusEnum}
</if>
group by hearlth.name, record.origin_buying_price, record.new_buying_price, record.origin_retail_price,
record.new_retail_price, record.reason, record.bus_no, org.name
</select>
<select id="searchHealthChangePriceByItemId" resultType="com.openhis.administration.dto.ChangePriceDataDto">
select hearlth.name as itemName,
org.name as orgName,
record.origin_buying_price as originBuyingPrice,
record.new_buying_price as newBuyingPrice,
record.origin_retail_price as originRetailPrice,
record.new_retail_price as newRetailPrice,
record.reason as reason,
record.bus_no as busNo,
sum(record.item_quantity) as itemQuantity,
sum(record.difference_buying_price) as differenceBuyingPrice,
sum(record.difference_retail_price) as differenceRetailPrice
from adm_change_price_record record
left join adm_healthcare_service hearlth on record.item_id = hearlth.id
left join adm_organization org on hearlth.offered_org_id = org.id
where record.item_id = #{itemId}
and record.item_category_enum = #{categoryEnum}
and record.status_enum = #{statusEnum}
group by hearlth.name, record.origin_buying_price, record.new_buying_price, record.origin_retail_price,
record.new_retail_price, record.reason, record.bus_no, org.name
</select>
<select id="searchChangePriceRecordDataByBusNo" resultType="com.openhis.administration.dto.ChangePriceDataDto">
select record.origin_buying_price as originBuyingPrice,
record.new_buying_price as newBuyingPrice,
record.origin_retail_price as originRetailPrice,
record.new_retail_price as newRetailPrice,
record.reason as reason,
record.bus_no as busNo,
cid.id as chargeId,
record.id as changePriceRecordId,
record.lot_number as lotNumber
from adm_change_price_record record
left join adm_charge_item_definition cid on record.item_id = cid.instance_id
where record.bus_no = #{busNo}
and record.status_enum = #{statusEnum}
and cid.status_enum = 2
</select>
<select id="searchChangePriceDataGroupByBusNo" resultType="com.openhis.administration.domain.ChangePriceRecord">
select
bus_no as busNo,applicant_time as applicantTime,status_enum as statusEnum,item_id as itemId
from adm_change_price_record where bus_no = #{busNo} group by busNo,applicantTime,statusEnum,item_id
</select>
</mapper>

14
openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefDetailAppMapper.xml Normal file
View File

@@ -0,0 +1,14 @@
<?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.administration.mapper.ChargeItemDefDetailAppMapper">
<select id="searchChargeDetailDataByBusNo" resultType="com.openhis.administration.domain.ChargeItemDefDetail">
select create_time
from adm_charge_item_def_detail
where
condition_value = #{value} and condition_code = #{code} and (delete_flag = '0' or delete_flag = '1')
</select>
</mapper>

31
openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefinitionMapper.xml
View File

@@ -4,4 +4,35 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.administration.mapper.ChargeItemDefinitionMapper">
<select id="getMedPriceByParam" resultType="com.openhis.administration.dto.ChargeItemDefDetailPriceDto">
SELECT cidd.amount as price, mmd.part_percent as partPercent
from adm_charge_item_definition cid
left join adm_charge_item_def_detail cidd on cid.id = cidd.definition_id
left join med_medication_definition mmd on cid.instance_id = mmd.id
where cidd.condition_code = #{conditionCode}
and cid.instance_id = #{instanceId}
and cidd.delete_flag = '0'
order by cidd.create_time desc limit 1
</select>
<select id="getDevicePriceByParam" resultType="com.openhis.administration.dto.ChargeItemDefDetailPriceDto">
SELECT cidd.amount as price, device.part_percent as partPercent
from adm_charge_item_definition cid
left join adm_charge_item_def_detail cidd on cid.id = cidd.definition_id
left join adm_device_definition device on cid.instance_id = device.id
where cidd.condition_code = #{conditionCode}
and cid.instance_id = #{instanceId}
and cidd.delete_flag = '0'
order by cidd.create_time desc limit 1
</select>
<select id="getProductPrice" resultType="com.openhis.administration.dto.ChargeItemDefDetailPriceDto">
SELECT cid.price as price
from adm_charge_item_definition cid
where cid.instance_id = #{instanceId}
and cid.status_enum = #{statusEnum}
and cid.delete_flag = '0'
order by cid.create_time desc limit 1
</select>
</mapper>

26
openhis-server-new/openhis-domain/src/main/resources/mapper/administration/DeviceDefinitionMapper.xml
View File

@@ -4,4 +4,30 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.administration.mapper.DeviceDefinitionMapper">
<!-- 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有 -->
<select id="searchDeviceListByKeyWord" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
select df.id as targetId, df.name as name, df.size as volume, details.amount as
originRetailPrice,def_details.amount as originBuyingPrice,df.bus_no as busNo,df.min_unit_code as unitCode
from adm_device_definition df
inner join adm_charge_item_definition actd on actd.instance_id = df.id
left join adm_charge_item_def_detail details on actd.id = details.definition_id
and details.id = (select cidd.id from adm_charge_item_def_detail cidd where actd.id = cidd.definition_id and
cidd.condition_code = '5' and cidd.delete_flag = '0' ORDER BY create_time DESC
LIMIT 1)
left join adm_charge_item_def_detail def_details on actd.id = def_details.definition_id
and def_details.id = (select cidd.id from adm_charge_item_def_detail cidd where actd.id = cidd.definition_id and
cidd.condition_code = '1' and cidd.delete_flag = '0' ORDER BY create_time DESC
LIMIT 1)
WHERE 1 = 1 and df.id in (select inventoty.item_id FROM wor_inventory_item inventoty where
inventoty.quantity > 0 and inventoty.delete_flag = '0' )
<if test="keyWord == ''">
limit 10
</if>
<if test="keyWord !=''">
and
(df.name like concat('%',#{keyWord},'%') or df.py_str like concat('%',#{keyWord},'%') or df.wb_str like
concat('%',#{keyWord},'%'))
</if>
</select>
</mapper>

5
openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterLocationMapper.xml
View File

@@ -4,4 +4,9 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.administration.mapper.EncounterLocationMapper">
<select id="searchEncounterDataByLocationId" resultType="com.openhis.administration.dto.PatientBedInfoDto">
select encounter_id as encounterId , location_id as bedLocationId
from adm_encounter_location where location_id = #{locationId} and status_enum = #{statusEnum} and form_enum = #{formEnum}
</select>
</mapper>

13
openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterMapper.xml
View File

@@ -49,4 +49,17 @@
AND T1.create_time &lt;
#{endDate};
</select>
<select id="searchEncounterDataByIds" resultType="com.openhis.administration.dto.EncounterDataDto">
select * from adm_encounter
where (class_enum = #{imp} or class_enum = #{amb}) and status_enum = #{encounterStatus}
and id in
<foreach collection="encounterIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<select id="getPatientIdByParam" resultType="com.openhis.administration.dto.EncounterDataDto">
select patient_id as patientId,id as encounterId
from adm_encounter encounter where id = #{encounterId} and class_enum = #{classEnum}
</select>
</mapper>

20
openhis-server-new/openhis-domain/src/main/resources/mapper/administration/HealthcareServiceMapper.xml
View File

@@ -4,4 +4,24 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.administration.mapper.HealthcareServiceMapper">
<select id="searchHealthByIds" resultType="com.openhis.administration.dto.HealthcareDto">
<!-- 根据项目id数组 加载挂号集合 -->
SELECT
health.id as itemId,
health.offered_org_id as orgId,health.name as name,health.category_code as categoryCode,health.type_code as
typeCode
FROM adm_healthcare_service as health
WHERE health.ID IN
<foreach collection="itemIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<!-- 查询所有 挂号数据 -->
<select id="searchAllHeathData" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
SELECT heal.id AS targetId,heal.name AS name,cid.price AS originRetailPrice,org.name as orgName
FROM public.adm_healthcare_service heal
INNER JOIN adm_charge_item_definition cid ON heal.id = cid.instance_id
INNER JOIN adm_organization org ON heal.offered_org_id = org.id
WHERE heal.delete_flag = '0' AND heal.offered_org_id = #{orgId} AND cid.status_enum = #{statusEnum}
</select>
</mapper>

31
openhis-server-new/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml
View File

@@ -4,4 +4,35 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.administration.mapper.LocationMapper">
<!-- 根据区域id数组查询 区域表 -->
<select id="searchLocationDataByIds" resultType="com.openhis.administration.dto.LocationDataDto">
select id as locationId,
bus_no as busNo,
name as areaName,
status_enum as statusEnum,
mode_enum as modeEnum,
operational_enum as operationalEnum
from adm_location
where delete_flag = '0'
and id in
<foreach collection="locationIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<!-- 根据区域id数组查询 区域表 -->
<select id="searchLocationDataByBusNo" resultType="com.openhis.administration.dto.PatientBedInfoDto">
select id as bedLocationId,
bus_no as busNo,
name as bedName,
status_enum as statusEnum,
mode_enum as modeEnum,
operational_enum as operationalEnum
from adm_location
where delete_flag = '0'
and bus_no like concat (#{busNo}, '%') and form_enum = #{formEnum} and status_enum = #{statusEnum}
</select>
</mapper>

14
openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml
View File

@@ -3,6 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.administration.mapper.OrganizationMapper">
<<<<<<< HEAD
<!-- 自定义selectById方法，确保包含所有字段，包括新增字段 -->
<select id="selectById" parameterType="java.lang.Long" resultType="com.openhis.administration.domain.Organization">
@@ -14,4 +15,17 @@
FROM adm_organization
WHERE id = #{id} AND delete_flag = '0'
</select>
=======
<select id="searchOrgDataByHealth" resultType="com.openhis.administration.dto.OrgDataDto">
SELECT org.id AS orgId, org.name AS orgName
FROM adm_organization AS org
WHERE id IN
(SELECT offered_org_id
FROM adm_healthcare_service heal
WHERE heal.delete_flag = '0'
GROUP BY heal.offered_org_id)
</select>
>>>>>>> upstream/develop
</mapper>

5
openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientMapper.xml
View File

@@ -4,4 +4,9 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.administration.mapper.PatientMapper">
<select id="searchPatientDataByPatientId" resultType="com.openhis.administration.dto.PatientDataDto">
select id as patientId,name as patientName,gender_enum as gender,id_card as idCard from adm_patient
where delete_flag = '0' and id = #{patientId} and active_flag = #{activeFlag}
</select>
</mapper>

2
openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefAppMapper.xml → openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientStudentMapper.xml
View File

@@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.administration.mapper.ChargeItemDefAppMapper">
<mapper namespace="com.openhis.administration.mapper.PatientStudentMapper">
</mapper>

46
openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerRoleMapper.xml
View File

@@ -3,5 +3,51 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.administration.mapper.PractitionerRoleMapper">
<!-- 根据员工ID 查询权限数据集 -->
<select id="searchPractitionerRoleByPractitionerId" resultType="com.openhis.administration.dto.RoleDataDto">
select id as roleId,org_id as orgId,location_id as locationId,specialty_enum as specialtyEnum,type_code as
typeCode
from adm_practitioner_role
where delete_flag = '0'
<if test="practitionerId != null and practitionerId!= ''">
and practitioner_id = #{practitionerId}
</if>
<if test="roleCode != null and roleCode!= ''">
and role_code = #{roleCode}
</if>
and location_id is not null order by id desc
</select>
<!-- 根据员工ID数组 查询权限数据集 -->
<select id="searchPractitionerRoleByPractitionerIds" resultType="com.openhis.administration.dto.RoleDataDto">
select id as roleId,org_id as orgId,location_id as locationId,specialty_enum as specialtyEnum,type_code as
typeCode
from adm_practitioner_role
where delete_flag = '0'
<if test="practitionerId != null and practitionerId!= ''">
and practitioner_id in
<foreach collection="practitionerIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="roleCode != null and roleCode!= ''">
and role_code = #{roleCode}
</if>
and location_id is not null order by id desc
</select>
<!-- 根据员工ID 查询位置ID数组 -->
<select id="searchPractitionerRoleLocationIds" resultType="java.lang.Long">
select location_id as locationId
from adm_practitioner_role
where delete_flag = '0'
<if test="practitionerId != null and practitionerId!= ''">
and practitioner_id = #{practitionerId}
</if>
<if test="roleCode != null and roleCode!= ''">
and role_code = #{roleCode}
</if>
and location_id is not null order by id desc
</select>
</mapper>

8
openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionNoDefinitionMapper.xml Normal file
View File

@@ -0,0 +1,8 @@
<?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.clinical.mapper.ConditionNoDefinitionMapper">
</mapper>

5
openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocInventoryItemStaticMapper.xml Normal file
View File

@@ -0,0 +1,5 @@
<?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.document.mapper.DocInventoryItemStaticMapper">
</mapper>

5
openhis-server-new/openhis-domain/src/main/resources/mapper/document/VitalSignsMapper.xml Normal file
View File

@@ -0,0 +1,5 @@
<?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.document.mapper.VitalSignsMapper">
</mapper>

7
openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ThreePartPayCallBackMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.financial.mapper.ThreePartPayCallBackMapper">
</mapper>

29
openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml
View File

@@ -42,4 +42,33 @@
ON T1.medication_product_id = T2.id
WHERE T1.delete_flag = 0
</select>
<!-- 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有 -->
<select id="searchMedListByKeyWord" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
select med.id as targetId, med_def.name as name, med.total_volume as volume, details.amount as
originRetailPrice,def_details.amount as originBuyingPrice,med_def.bus_no as busNo,med_def.min_unit_code as unitCode
from med_medication med
inner join med_medication_definition med_def on med.medication_def_id = med_def.id
inner join adm_charge_item_definition actd on actd.instance_id = med_def.id
left join adm_charge_item_def_detail details on actd.id = details.definition_id
and details.id = (select cidd.id from adm_charge_item_def_detail cidd where actd.id = cidd.definition_id and
cidd.condition_code = '5' and cidd.delete_flag = '0' ORDER BY create_time DESC
LIMIT 1)
left join adm_charge_item_def_detail def_details on actd.id = def_details.definition_id
and def_details.id = (select cidd.id from adm_charge_item_def_detail cidd where actd.id = cidd.definition_id and
cidd.condition_code = '1' and cidd.delete_flag = '0' ORDER BY create_time DESC
LIMIT 1)
WHERE med.delete_flag = '0' and med_def.id in (select inventoty.item_id FROM wor_inventory_item inventoty where
inventoty.quantity > 0 and inventoty.delete_flag = '0' )
<if test="keyWord == ''">
limit 10
</if>
<if test="keyWord !=''">
and
(med_def.name like concat('%',#{keyWord},'%') or med_def.merchandise_name like concat('%',#{keyWord},'%') or
med_def.py_str like concat('%',#{keyWord},'%') or
med_def.wb_str like concat('%',#{keyWord},'%') or med_def.merchandise_py_str like concat('%',#{keyWord},'%')
or med_def.merchandise_wb_str like concat('%',#{keyWord},'%'))
</if>
</select>
</mapper>

7
openhis-server-new/openhis-domain/src/main/resources/mapper/nenu/GfRatioApplicationMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?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.nenu.mapper.GfRatioApplicationMapper">
</mapper>

7
openhis-server-new/openhis-domain/src/main/resources/mapper/nenu/GfRatioMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?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.nenu.mapper.GfRatioMapper">
</mapper>

18
openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml
View File

@@ -12,4 +12,22 @@
AND NAME = #{activityName} LIMIT 1
</select>
<!-- 根据项目id数组 加载诊疗集合 -->
<select id="searchActivityDefinitionByIds" resultType="com.openhis.workflow.dto.ActivityDto">
SELECT id as itemId, bus_no as busNo, name as name
FROM wor_activity_definition
WHERE id IN
<foreach collection="itemIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<!-- 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有 -->
<select id="searchActivityListByKeyWord" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
SELECT cid.price AS originRetailPrice, ad.id AS targetId, ad.bus_no AS busNo, ad.name AS name
FROM wor_activity_definition ad
inner join adm_charge_item_definition cid on ad.id = cid.instance_id
WHERE ad.delete_flag = '0'
AND (name LIKE concat('%', #{keyWord}, '%') or py_str LIKE concat('%', #{keyWord}, '%') or
wb_str LIKE concat('%', #{keyWord}, '%'))
</select>
</mapper>

24
openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/InventoryItemMapper.xml
View File

@@ -3,5 +3,29 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.workflow.mapper.InventoryItemMapper">
<!-- 根据药品、耗材ID数组查询 存库大于 零 并且分组的集合数据 -->
<select id="searchResultDataList" resultType="com.openhis.workflow.dto.AdjustPriceDto">
SELECT item_id as itemId, item_table as itemTable ,location_id as locationId,quantity as totalCount,lot_number as
lotNumber,unit_code as unitCode
FROM wor_inventory_item
WHERE
quantity > 0 AND delete_flag = '0' AND
item_id IN
<foreach collection="itemIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<!-- 根据药品、耗材ID数组查询 存库大于 零 并且分组的集合数据 -->
<select id="searchResultDataListByGroup" resultType="com.openhis.workflow.dto.AdjustPriceDto">
SELECT item_id as itemId
FROM wor_inventory_item
WHERE
quantity > 0 AND delete_flag = '0' AND
item_id IN
<foreach collection="itemIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
GROUP BY item_id
</select>
</mapper>

210
openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestMapper.xml
View File

@@ -3,5 +3,215 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.workflow.mapper.SupplyRequestMapper">
<!-- 根据 调价单号 查询 supplyrequest 和 价格主表 -->
<select id="searchDataForBusNo" resultType="com.openhis.workflow.dto.ChangePriceDto">
SELECT acid.id as chargeId,
wsr.item_id as itemId,
wsr.price as newPrice,
wsr.retail_price as retailPrice,
wsr.reason as reason,
wsr.item_quantity as quantity,
wsr.id as supplyRequestId
FROM wor_supply_request wsr
INNER JOIN adm_charge_item_definition acid ON wsr.item_id = acid.instance_id
WHERE wsr.bus_no = #{busNo}
</select>
<select id="searchGroupDataForBusNo" resultType="com.openhis.workflow.dto.ChangePriceDto">
SELECT wsr.item_id as itemId, wsr.item_table as itemTable, wsr.retail_price as newPrice
FROM wor_supply_request wsr
WHERE wsr.bus_no = #{busNo}
GROUP BY wsr.item_id, wsr.item_table, wsr.retail_price
</select>
<!-- 根据调价单号 查询未审核的详情-->
<select id="searchMedInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
SELECT sr.item_id as targetId,
med_def.name as name,
med.total_volume as volume,
sr.price as newBuyingPrice,
sr.retail_price as newRetailPrice,
details.amount as originRetailPrice,
sr.reason as reason,
def_details.amount as originBuyingPrice,
sr.unit_code as unitCode,
sum(sr.item_quantity) as totalQuantity
FROM wor_supply_request sr
LEFT JOIN med_medication_definition med_def ON sr.item_id = med_def.id
LEFT JOIN med_medication med ON sr.item_id = med.id
LEFT JOIN adm_charge_item_definition actd ON actd.instance_id = med_def.id
LEFT JOIN adm_charge_item_def_detail details ON actd.id = details.definition_id
AND details.id = (SELECT cidd.id
FROM adm_charge_item_def_detail cidd
WHERE actd.id = cidd.definition_id
AND cidd.condition_code = '5'
AND cidd.delete_flag = '0'
ORDER BY create_time DESC
LIMIT 1)
LEFT JOIN adm_charge_item_def_detail def_details
ON actd.id = def_details.definition_id
AND def_details.id = (SELECT cidd.id
FROM adm_charge_item_def_detail cidd
WHERE actd.id = cidd.definition_id
AND cidd.condition_code = '1'
AND cidd.delete_flag = '0'
ORDER BY create_time DESC
LIMIT 1)
WHERE sr.bus_no = #{busNo}
GROUP BY sr.item_id, med_def.name, med.total_volume, sr.price, details.amount, sr.reason, sr.retail_price, def_details.amount, sr.unit_code
</select>
<!-- 根据调价单号 查询已经审核过的详情-->
<select id="searchHistoryMedInfoData" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
SELECT sr.item_id as targetId,
med_def.name as name,
med.total_volume as volume,
sr.price as newBuyingPrice,
sr.retail_price as newRetailPrice,
details.amount as originRetailPrice,
def_details.amount as originBuyingPrice,
sr.reason as reason,
sr.unit_code as unitCode,
sum(item_quantity) as totalQuantity
FROM wor_supply_request sr
LEFT JOIN med_medication_definition med_def ON sr.item_id = med_def.id
LEFT JOIN med_medication med ON sr.item_id = med.id
LEFT JOIN adm_charge_item_definition actd ON actd.instance_id = med_def.id
LEFT JOIN adm_charge_item_def_detail details ON actd.id = details.definition_id
AND details.id = (SELECT cidd.id
FROM adm_charge_item_def_detail cidd
WHERE actd.id = cidd.definition_id
AND cidd.condition_code = '5'
AND cidd.create_time <![CDATA[ < ]]> #{createTime} LIMIT 1)
LEFT JOIN adm_charge_item_def_detail def_details
ON actd.id = def_details.definition_id
AND def_details.id = (SELECT acidd.id
FROM adm_charge_item_def_detail acidd
WHERE actd.id = acidd.definition_id
AND acidd.condition_code = '1'
AND acidd.create_time <![CDATA[ < ]]> #{createTime} LIMIT 1)
WHERE sr.bus_no = #{busNo}
GROUP BY sr.item_id, med_def.name, med.total_volume, sr.price, details.amount, sr.reason, sr.retail_price, def_details.amount, sr.unit_code
</select>
<!-- 查询device -->
<select id="searchDeviceInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
SELECT sr.item_id as targetId,
ad.name as name,
ad.size as volume,
sr.price as newBuyingPrice,
sr.retail_price as newRetailPrice,
details.amount as originRetailPrice,
sr.reason as reason,
def_details.amount as originBuyingPrice
FROM wor_supply_request sr
LEFT JOIN adm_device_definition ad on sr.item_id = ad.id
LEFT JOIN adm_charge_item_definition actd ON actd.instance_id = ad.id
LEFT JOIN adm_charge_item_def_detail details ON actd.id = details.definition_id
AND details.id = (SELECT cidd.id
FROM adm_charge_item_def_detail cidd
WHERE actd.id = cidd.definition_id
AND cidd.condition_code = '5'
AND cidd.delete_flag = '0'
ORDER BY create_time DESC
LIMIT 1)
LEFT JOIN adm_charge_item_def_detail def_details
ON actd.id = def_details.definition_id
AND def_details.id = (SELECT cidd.id
FROM adm_charge_item_def_detail cidd
WHERE actd.id = cidd.definition_id
AND cidd.condition_code = '1'
AND cidd.delete_flag = '0'
ORDER BY create_time DESC
LIMIT 1)
WHERE sr.bus_no = #{busNo}
GROUP BY sr.item_id, ad.name, ad.size, sr.price, details.amount, sr.reason, sr.retail_price, def_details.amount
</select>
<!-- 查询device 历史记录-->
<select id="searchHistoryDeviceInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
SELECT sr.item_id as targetId,
ad.name as name,
ad.size as volume,
sr.price as newBuyingPrice,
sr.retail_price as newRetailPrice,
details.amount as originRetailPrice,
def_details.amount as originBuyingPrice,
sr.reason as reason,
sr.unit_code as unitCode,
sum(item_quantity) as totalQuantity
FROM wor_supply_request sr
LEFT JOIN adm_device_definition ad on sr.item_id = ad.id
LEFT JOIN adm_charge_item_definition actd ON actd.instance_id = ad.id
LEFT JOIN adm_charge_item_def_detail details ON actd.id = details.definition_id
AND details.id = (SELECT cidd.id
FROM adm_charge_item_def_detail cidd
WHERE actd.id = cidd.definition_id
AND cidd.condition_code = '5'
AND cidd.delete_flag = '0'
AND cidd.create_time <![CDATA[ < ]]> #{createTime} LIMIT 1)
LEFT JOIN adm_charge_item_def_detail def_details
ON actd.id = def_details.definition_id
AND def_details.id = (SELECT acidd.id
FROM adm_charge_item_def_detail acidd
WHERE actd.id = acidd.definition_id
AND acidd.condition_code = '1'
AND acidd.delete_flag = '0'
AND acidd.create_time <![CDATA[ < ]]> #{createTime} LIMIT 1)
WHERE sr.bus_no = #{busNo}
GROUP BY sr.item_id, ad.name, ad.size, sr.price, details.amount, sr.reason, def_details.amount, sr.unit_code, sr.retail_price
</select>
<select id="searchActivityInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
SELECT sr.id as targetId,
ad.name as name,
sr.retal_price as newRetailPrice,
cid.price as originBuyingPrice,
sr.reason as reason
FROM wor_supply_request sr
LEFT JOIN wor_activity_definition ad ON sr.item_id = ad.id
LEFT JOIN adm_charge_item_definition cid on ad.id = cid.instance_id
WHERE ad.delete_flag = '0'
AND sr.bus_no = #{busNo}
</select>
<select id="searchHistoryActivityInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
SELECT sr.id as targetId,
ad.name as name,
sr.price as originBuyingPrice,
sr.retal_price as newRetailPrice,
sr.reason as reason
FROM wor_supply_request sr
LEFT JOIN wor_activity_definition ad ON sr.item_id = ad.id
LEFT JOIN adm_charge_item_definition cid on ad.id = cid.instance_id
WHERE ad.delete_flag = '0'
AND sr.bus_no = #{busNo}
</select>
<select id="searchHealthInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
SELECT sr.id as targetId,
heal.name as name,
sr.retail_price as newRetailPrice,
cid.price as originBuyingPrice,
sr.reason as reason,
org.name as orgName
FROM wor_supply_request sr
LEFT JOIN adm_healthcare_service heal ON sr.item_id = heal.id
LEFT JOIN adm_organization org ON heal.offered_org_id = org.id
LEFT JOIN adm_charge_item_definition cid on heal.id = cid.instance_id
WHERE heal.delete_flag = '0'
AND sr.bus_no = #{busNo}
</select>
<select id="searchHistoryHealthInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
SELECT sr.id as targetId,
heal.name as name,
sr.price as originBuyingPrice,
sr.retail_price as newRetailPrice,
sr.reason as reason,
org.name as orgName
FROM wor_supply_request sr
LEFT JOIN adm_healthcare_service heal ON sr.item_id = heal.id
LEFT JOIN adm_organization org ON heal.offered_org_id = org.id
LEFT JOIN adm_charge_item_definition cid on heal.id = cid.instance_id
WHERE heal.delete_flag = '0'
AND sr.bus_no = #{busNo}
</select>
</mapper>