Merge remote-tracking branch 'origin/master_feat_ysy_20250929' into master_feat_ysy_20250929

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

@@ -73,5 +73,10 @@ public class FsUserInformationCollectionSchedule extends BaseEntity{
     /** 公司用户id */
     private Long companyUserId;
 
+    /**
+     * 药师id
+     */
+    private Long drugDoctorId;
+
 
 }

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -960,6 +960,10 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
                     map.setId(schedule.getId());
                     map.setOrderCode(packageOrder.getOrderSn());
                     map.setCurrentStep(PrescriptionTaskStepEnum.WAITING_PRESCRIBE.getCode());
+                    FsPrescribe fsPrescribe = fsPrescribeService.selectFsPrescribeByPrescribeId(prescribeId);
+                    if (fsPrescribe != null) {
+                        map.setDrugDoctorId(fsPrescribe.getDrugDoctorId());
+                    }
                     informationCollectionScheduleMapper.updateFsUserInformationCollectionSchedule(map);
                 }
             }

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

@@ -159,7 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             id, collection_id, user_id, doctor_id,
             package_id, package_name, current_step, status, create_time,
-            completed_time, terminated_time, terminated_by, remark,order_code,company_id,company_user_id
+            completed_time, terminated_time, terminated_by, remark,order_code,company_id,company_user_id,drug_doctor_id
         FROM fs_user_information_collection_schedule
         WHERE collection_id = #{collectionId}
         AND status = 1
@@ -212,6 +212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="collectionId != null">collection_id = #{collectionId},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="doctorId != null">doctor_id = #{doctorId},</if>
+            <if test="drugDoctorId != null">drug_doctor_id = #{drugDoctorId},</if>
             <if test="packageId != null">package_id = #{packageId},</if>
             <if test="packageName != null">package_name = #{packageName},</if>
             <if test="currentStep != null">current_step = #{currentStep},</if>