合同工作经历，证件类型，发送短信

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

@@ -283,9 +283,11 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
         String systemOwnerMobile = null;
         StringBuffer systemOwnerAddress = new StringBuffer();
         if (systemOwner == null) {
-            if ("30".equals(memberShip.getMdDropOptionId())) {
+            if (Long.valueOf("30").equals(memberShip.getMdDropOptionId())) {
                 systemOwnerIdNo = basicInfo.getIdNo();
                 systemOwnerMobile = basicInfo.getMobileNo();
+                data.put("secondSubsystemOwner", memberShip.getSubsystemOwner());
+                data.put("secondSubsystemSignature", memberShip.getSubsystemOwner());
             }
         } else {
             systemOwnerIdNo = systemOwner.getIdNo();
@@ -353,9 +355,7 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
 
             if (i < workingExperienceList.size()) {
                 item = workingExperienceList.get(i);
-            }
 
-            if (item != null) {
                 experienceValue = item.getWorkingCompany();
                 positionValue = item.getPosition();
                 periodValue = item.getWorkingStart() + "~" + item.getWorkingEnd();
@@ -507,17 +507,17 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
         images.put("secondIDType3", unCheckFile);
         images.put("secondIDType4", unCheckFile);
 
-        if (idType.indexOf("身份证") > 0) {
+        if (idType.indexOf("身份证") >= 0) {
             images.put("secondIDType1", checkFile);
             return;
         }
 
-        if (idType.indexOf("台胞证") > 0) {
+        if (idType.indexOf("台胞证") >= 0) {
             images.put("secondIDType2", checkFile);
             return;
         }
 
-        if (idType.indexOf("护照") > 0) {
+        if (idType.indexOf("护照") >= 0) {
             images.put("secondIDType3", checkFile);
             return;
         }

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

@@ -759,7 +759,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
         String templateCode;
         String content;
         // S2的短信模板
-        if ("30".equals(memberShip.getMdDropOptionId())) {
+        if (Long.valueOf("30").equals(memberShip.getMdDropOptionId())) {
             /* 短信提醒 */
             templateCode = systemConfigService.getSingleConfigValue("ALI_SMS_CONTRACT_S2");
             content = "{\"name\":\""+name+"\"}";
@@ -772,7 +772,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
         for (int i = 0; i < uniqueList.size(); i++) {
 
             mobileNo = uniqueList.get(i);
-            sendService.sendEmailOrSMS("sms", mobileNo, "2", content, templateCode, null, null, "电子报聘合同生成提醒", 99, hiringBasicInfoId);
+            sendService.sendEmailOrSMS("sms", mobileNo, "0", content, templateCode, null, null, "电子报聘合同生成提醒", 99, hiringBasicInfoId);
 
         }
     }