S2合同团队长信息，合同编号生成修改

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

@@ -278,15 +278,23 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
 
 
         data.put("secondSubsystemOwner", memberShip.getSubsystemOwner());
         data.put("secondSubsystemOwner", memberShip.getSubsystemOwner());
         data.put("secondSubsystemSignature", memberShip.getSubsystemOwner());
         data.put("secondSubsystemSignature", memberShip.getSubsystemOwner());
-        data.put("secondSubsystemIDNo", systemOwner.getIdNo());
-        // 查团队长地址
+        // 查团队长信息
+        String systemOwnerIdNo = null;
+        String systemOwnerMobile = null;
         StringBuffer systemOwnerAddress = new StringBuffer();
         StringBuffer systemOwnerAddress = new StringBuffer();
-        if (systemOwner != null) {
+        if (systemOwner == null) {
+            if ("30".equals(memberShip.getMdDropOptionId())) {
+                systemOwnerIdNo = basicInfo.getIdNo();
+                systemOwnerMobile = basicInfo.getMobileNo();
+            }
+        } else {
+            systemOwnerIdNo = systemOwner.getIdNo();
+            systemOwnerMobile = systemOwner.getMobileNo();
             systemOwnerAddress.append(systemOwner.getProvinceName()).append(systemOwner.getCityName());
             systemOwnerAddress.append(systemOwner.getProvinceName()).append(systemOwner.getCityName());
         }
         }
+        data.put("secondSubsystemIDNo", systemOwnerIdNo);
         data.put("secondSubsystemAddress", systemOwnerAddress.toString());
         data.put("secondSubsystemAddress", systemOwnerAddress.toString());
-        data.put("secondSubsystemMobileNo", systemOwner.getMobileNo());
-
+        data.put("secondSubsystemMobileNo", systemOwnerMobile);
 
 
         data.put("secondMentor", mentorName);
         data.put("secondMentor", mentorName);
         data.put("secondMentorIDNo", mentorIdNo);
         data.put("secondMentorIDNo", mentorIdNo);
@@ -614,7 +622,6 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
 
 
     @Override
     @Override
     public String getNextContractNo() {
     public String getNextContractNo() {
-        String contractNo = practitionerHiringMapper.getNextContractNo();
-        return "YDLBC-0" + contractNo;
+        return practitionerHiringMapper.getNextContractNo();
     }
     }
 }
 }