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

fs-doctor-app/src/main/java/com/fs/app/controller/PrescribeController.java

@@ -96,7 +96,7 @@ public class PrescribeController extends  AppBaseController {
             IPage<Hospital580PrescriptionScrmEntity> page = orderScrmService.page(
                     new Page<Hospital580PrescriptionScrmEntity>(param.getPageNum(), param.getPageSize())
                     , new LambdaQueryWrapper<Hospital580PrescriptionScrmEntity>()
-                            .eq(Hospital580PrescriptionScrmEntity::getDoctorId,param.getDoctorId())
+                            .eq(Hospital580PrescriptionScrmEntity::getAuditApothecaryId,param.getDoctorId())
                             .orderByDesc(Hospital580PrescriptionScrmEntity::getCreateTime)
             );
             List<FsPrescribeListDVO> list = page.getRecords().stream()

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

@@ -810,6 +810,7 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
         prescribe.setAuditTime(LocalDateTime.now());
         FsDoctor doctor=doctorService.selectFsDoctorByDoctorId(param.getDoctorId());
         prescribe.setAuditApothecaryName(doctor.getDoctorName());
+        prescribe.setAuditApothecaryId(doctor.getDoctorId());
         prescribe.setReason(param.getAuditReason());
         prescribe.updateById();
         if(param.getStatus().equals(1)){

fs-service/src/main/java/com/fs/hospital580/entity/Hospital580PrescriptionScrmEntity.java

@@ -181,6 +181,10 @@ public class Hospital580PrescriptionScrmEntity extends Model<Hospital580Prescrip
     @TableField("audit_apothecary_name")
     private String auditApothecaryName;
 
+    @ApiModelProperty("审方药师名称")
+    @TableField("audit_apothecary_id")
+    private Long auditApothecaryId;
+
     @ApiModelProperty("问诊知情确认页面URL")
     @TableField("jump_url")
     private String jumpUrl;

fs-service/src/main/resources/mapper/hospital580/Hospital580PrescriptionScrmMapper.xml

@@ -42,6 +42,7 @@
         <result column="audit_status" property="auditStatus" />
         <result column="audit_time" property="auditTime" />
         <result column="audit_apothecary_name" property="auditApothecaryName" />
+        <result column="audit_apothecary_id" property="auditApothecaryId" />
         <result column="jump_url" property="jumpUrl" />
         <result column="prescription_status" property="prescriptionStatus" />
         <result column="store_order_id" property="storeOrderId" />