wjj пре 2 дана
родитељ
комит
8e3654bc32

+ 5 - 0
fs-service/src/main/java/com/fs/his/domain/FsUserInformationCollectionSchedule.java

@@ -78,5 +78,10 @@ public class FsUserInformationCollectionSchedule extends BaseEntity{
      */
     private Long drugDoctorId;
 
+    /**
+     * 药师id
+     */
+    private String drugDoctorName;
+
 
 }

+ 3 - 0
fs-service/src/main/resources/mapper/qw/FsUserInformationCollectionScheduleMapper.xml

@@ -79,7 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         s.user_id,
         c.user_name,
         s.doctor_id,
+        dd.doctor_id as drugDoctorId,
         d.doctor_name,
+        dd.doctor_name as drugDoctorName,
         s.package_id,
         s.package_name,
         s.current_step,
@@ -94,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         fs_user_information_collection_schedule s
         LEFT JOIN fs_user_information_collection c ON s.collection_id = c.id
         LEFT JOIN fs_doctor d ON s.doctor_id = d.doctor_id
+        LEFT JOIN fs_doctor dd ON s.drug_doctor_id = dd.doctor_id
         <where>
             <!-- 动态过滤条件 -->
             <if test="collectionId != null"> AND s.collection_id = #{collectionId}</if>