益寿缘-优化用户确认逻辑

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

@@ -606,6 +606,9 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
             o.setTelPhone(f.getPatientTel());
             FsDoctor fsDoctor = doctorMapper.selectFsDoctorByDoctorId(f.getDoctorId());
             Asserts.notNull(fsDoctor,String.format("医生 %s 未找到！",f.getDoctorId()));
+            //执业证号
+            o.setJobLicenseNumber(fsDoctor.getPractiseCode());
+            //医生证号
             o.setDoctorNo(fsDoctor.getCertificateCode());
             o.setDoctorTitle(fsDoctor.getPosition());
 
@@ -684,6 +687,9 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
             o.setTelPhone(f.getPatientTel());
             FsDoctor fsDoctor = doctorMapper.selectFsDoctorByDoctorId(f.getDoctorId());
             Asserts.notNull(fsDoctor,String.format("医生 %s 未找到！",f.getDoctorId()));
+            //执业证号
+            o.setJobLicenseNumber(fsDoctor.getPractiseCode());
+            //医生证号
             o.setDoctorNo(fsDoctor.getCertificateCode());
             o.setDoctorTitle(fsDoctor.getPosition());
 
@@ -1400,9 +1406,18 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
                 }
             }
         }
+        //TODO 医生确认处方后立即生成处方图片
 
     }
 
+    //即时生成处方图片
+    private void createImg(Long prescribeId) {
+        String prescribeImgUrl = this.PrescribeImgYsyTask(prescribeId,1);//1-处方只带医生签名
+//        fsPrescribe.setPrescribeImgUrl(prescribeImgUrl);
+//        fsPrescribeService.updateFsPrescribe(fsPrescribe);
+    }
+
+
     @Override
     public void collectionPrescribe(Long prescribeId) {
         FsPrescribe fsPrescribe = fsPrescribeMapper.selectFsPrescribeByPrescribeId(prescribeId);

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserInformationCollectionServiceImpl.java

@@ -694,7 +694,10 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         //用户信息采集表id
         Long collectionId = collection.getId();
         FsUserInformationCollectionSchedule schedule = scheduleMapper.selectCollectionScheduleByCollectionId(collectionId);
-
+        if (schedule != null&&schedule.getStatus() != 1) {
+            //没有进行中的进度 抛出提示信息
+            return R.error("用户采集信息已更新，请扫描最新二维码确认");
+        }
         //支付0元的创建订单就是待开方
         if (schedule != null&&(schedule.getStatus() == 2||schedule.getStatus() == 3) && collection.getAmount().compareTo(new BigDecimal(0))==1) {
             return R.error("用户采集信息已更新，请扫描最新二维码确认");