本地上传

ruoyi-info/src/main/java/com/ruoyi/info/order/service/impl/OrderServiceImpl.java

@@ -314,6 +314,11 @@ public class OrderServiceImpl implements IOrderService {
             if (ObjectUtil.isNotNull(hospitalDepartmentVo)) {
                 o.setHospitalDepartmentName(hospitalDepartmentVo.getName());
             }
+            //服务
+            ServiceProductVo serviceProductVo = JSONObject.parseObject(o.getServiceInfo(), ServiceProductVo.class);
+            if (ObjectUtil.isNotNull(serviceProductVo)) {
+                o.setServiceName(serviceProductVo.getName());
+            }
             if(queryPatient) {
                 PatientVo patientVo = JSONObject.parseObject(o.getPatientInfo(), PatientVo.class);
                 if (ObjectUtil.isNotNull(patientVo)) {

ruoyi-info/src/main/resources/mapper/order/OrderMapper.xml

@@ -49,9 +49,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <sql id="queryList">
-        select o.*, u.nickname as userName, u.mobile as userMobile, sp.name as serviceName from tb_order o
+        select o.*, u.nickname as userName, u.mobile as userMobile from tb_order o
         left join tb_user u on u.id = o.user_id
-        left join tb_service_product sp on sp.id = o.service_id
         <where>
             <if test="bo.orderNo != null and bo.orderNo != ''">
                 and o.order_no like concat('%', #{bo.orderNo}, '%')
@@ -69,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and u.mobile like concat('%', #{bo.userMobile}, '%')
             </if>
             <if test="bo.serviceName != null and bo.serviceName != ''">
-                and sp.name like concat('%', #{bo.serviceName}, '%')
+                and JSON_UNQUOTE(JSON_EXTRACT(o.service_info, '$.name')) like concat('%', #{bo.serviceName}, '%')
             </if>
             <if test="bo.startTime != null">
                 and o.create_time >= #{bo.startTime}