xinyilu/xinelu-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小程序订单查看修改

Browse Source
This commit is contained in:
张恒 2023-10-18 09:45:51 +08:00
parent e3099218b1
commit 0a88e8b1f9
2 changed files with 63 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/AppletGoodsOrderVO.java
View File

@ -7,6 +7,7 @@ import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
@ -174,6 +175,10 @@ public class AppletGoodsOrderVO implements Serializable {
*/ */
private String orderType; private String orderType;
/**
* 订单类型，积分兑换：INTEGRAL_EXCHANGE，直接购买：DIRECT_BUY，健康咨询：HEALTH_CONSULTATION
*/
private List<String> orderTypeList;
/** /**
* 积分抵扣数量 * 积分抵扣数量

109
xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml
View File

@ -155,6 +155,9 @@
<if test="orderType != null and orderType != ''"> <if test="orderType != null and orderType != ''">
and gr.order_type = #{orderType} and gr.order_type = #{orderType}
</if> </if>
<if test="orderType = null and orderType = ''">
and gr.order_type IN #{orderTypeList}
</if>
and gr.del_flag = 0 and gr.del_flag = 0
and god.del_flag = 0 and god.del_flag = 0
</where> </where>
@ -272,63 +275,67 @@
<select id="getAppointmentOrderDetailsInfo" resultMap="getAppointmentDetailsResultMap"> <select id="getAppointmentOrderDetailsInfo" resultMap="getAppointmentDetailsResultMap">
SELECT pi.patient_name,
pi.phone patientPhone, SELECT pi.patient_name,
aor.id appointmentOrderId, pi.phone patientPhone,
aor.patient_id, aor.id appointmentOrderId,
aor.order_no, aor.patient_id,
aor.total_price, aor.order_no,
aor.order_status, aor.total_price,
aor.remark, aor.order_status,
aor.create_time, aor.remark,
aor.order_type, aor.create_time,
aor.companion_start_date, aor.order_type,
aor.companion_end_date, aor.companion_start_date,
aor.companion_days, aor.companion_end_date,
aor.order_write_name, aor.companion_days,
aod.nurse_station_item_id, aor.order_write_name,
aod.service_address, aod.nurse_station_item_id,
aod.service_date, aod.service_address,
aod.service_start_time, aod.service_date,
aod.service_end_time, aod.service_start_time,
aod.nurse_item_name, aod.service_end_time,
aod.nurse_item_price, aod.nurse_item_name,
aod.item_serve_duration_unit, aod.nurse_item_price,
aod.consumable_total_price, aod.item_serve_duration_unit,
aoc.id, aod.consumable_total_price,
aoc.appoint_order_details_id, aoc.id,
aoc.order_consumable_name, aoc.appoint_order_details_id,
aoc.order_consumable_price, aoc.order_consumable_name,
aoc.order_consumable_count, aoc.order_consumable_price,
aoc.consumable_unit, aoc.order_consumable_count,
aod.disabling_condition, aoc.consumable_unit,
aod.disabling_reason, aod.disabling_condition,
aod.caregiver_name, aod.disabling_reason,
aod.caregiver_phone, aod.caregiver_name,
aod.hospital_name, aod.caregiver_phone,
aod.department_name, aod.hospital_name,
aod.hospital_bed_number aod.department_name,
FROM appointment_order aor aod.hospital_bed_number
LEFT JOIN appointment_order_details aod ON aor.order_no = aod.order_no FROM appointment_order aor
LEFT JOIN appointment_order_consumable aoc ON aod.id = aoc.appoint_order_details_id LEFT JOIN appointment_order_details aod ON aor.order_no = aod.order_no
LEFT JOIN patient_info pi ON pi.id = aor.patient_id LEFT JOIN appointment_order_consumable aoc ON aod.id = aoc.appoint_order_details_id
where aor.order_no = #{ordeNo} LEFT JOIN patient_info pi ON pi.id = aor.patient_id
AND aor.del_flag = 0 where aor.order_no = #{ordeNo}
and aod.del_flag = 0 AND aor.del_flag = 0
and aod.del_flag = 0
</select> </select>
<select id="getNurseStationByItemId" <select id="getNurseStationByItemId"
resultType="com.xinelu.applet.vo.specialdisease.AppointmentOrderDetailsInfoVO"> resultType="com.xinelu.applet.vo.specialdisease.AppointmentOrderDetailsInfoVO">
SELECT ns.nurse_station_name nurseStationName,
ns.phone stationPhone, SELECT ns.nurse_station_name nurseStationName,
ns.address, ns.phone stationPhone,
ns.station_picture_url, ns.address,
nsi.item_picture_url ns.station_picture_url,
FROM nurse_station_item nsi nsi.item_picture_url
LEFT JOIN nurse_station ns ON nsi.nurse_station_id = ns.id FROM nurse_station_item nsi
WHERE nsi.id = #{nurseStationItemId} LEFT JOIN nurse_station ns ON nsi.nurse_station_id = ns.id
WHERE nsi.id = #{nurseStationItemId}
</select> </select>
</mapper> </mapper>