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

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java

@@ -205,6 +205,11 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             CustomerFileUpload fileUpload = aclFileUploadDALService.findFilePathInfo(targetType,targetUseFor,practitionerId);
             CustomerFileUpload fileUpload = aclFileUploadDALService.findFilePathInfo(targetType,targetUseFor,practitionerId);
             String imagePath = (fileUpload != null) ? fileUpload.getFilePath() : null;
             String imagePath = (fileUpload != null) ? fileUpload.getFilePath() : null;
             basicInfo.setHeadImagePath(imagePath);
             basicInfo.setHeadImagePath(imagePath);
+            //获取二维码
+            targetUseFor = 9;
+            fileUpload = aclFileUploadDALService.findFilePathInfo(targetType,targetUseFor,practitionerId);
+            String qrCodePath = (fileUpload != null) ? fileUpload.getFilePath() : null;
+            basicInfo.setQrCodePath(qrCodePath);
             //获取体系信息
             //获取体系信息
             Long subordinateId = practitionerInfo.getSubordinateId();
             Long subordinateId = practitionerInfo.getSubordinateId();
             if(subordinateId != null){
             if(subordinateId != null){

yd-api/src/main/java/com/yd/api/practitioner/vo/login/PractitionerLoginBasicInfo.java

@@ -8,6 +8,7 @@ public class PractitionerLoginBasicInfo {
     private String insurerBranchName;//分公司名称
     private String insurerBranchName;//分公司名称
     private String subordinateName;//体系名
     private String subordinateName;//体系名
     private String subordinateLeader;//团队长
     private String subordinateLeader;//团队长
+    private String qrCodePath;//二维码地址
 
 
     public String getName() {
     public String getName() {
         return name;
         return name;
@@ -64,4 +65,12 @@ public class PractitionerLoginBasicInfo {
     public void setSubordinateLeader(String subordinateLeader) {
     public void setSubordinateLeader(String subordinateLeader) {
         this.subordinateLeader = subordinateLeader;
         this.subordinateLeader = subordinateLeader;
     }
     }
+
+    public String getQrCodePath() {
+        return qrCodePath;
+    }
+
+    public void setQrCodePath(String qrCodePath) {
+        this.qrCodePath = qrCodePath;
+    }
 }
 }