合并master

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

@@ -258,12 +258,12 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             payScaleInfo.setMonDtlAmount(monDtlAmount);
             payScaleInfo.setMonDtlAmount(monDtlAmount);
             payScaleInfo.setMonDtlItem("实发薪水");
             payScaleInfo.setMonDtlItem("实发薪水");
             payScaleInfo.setDrpTitleCode(list.get(0).getGrade());
             payScaleInfo.setDrpTitleCode(list.get(0).getGrade());
-            payScaleInfo.setMonDtlPeriod(Integer.valueOf(key));
+            payScaleInfo.setMonDtlPeriod(Long.valueOf(key));
 
 
             resultList.add(payScaleInfo);
             resultList.add(payScaleInfo);
         }
         }
 
 
-        resultList.sort(Comparator.comparingInt(PayScaleInfo :: getMonDtlPeriod).reversed());
+        resultList.sort(Comparator.comparingLong(PayScaleInfo :: getMonDtlPeriod).reversed());
         responseVO.setPayScaleInfos(resultList);
         responseVO.setPayScaleInfos(resultList);
 
 
 //        if(!Strings.isNullOrEmpty(practitionerIdEG)){
 //        if(!Strings.isNullOrEmpty(practitionerIdEG)){

yd-api/src/main/java/com/yd/rmi/n22/common/utils/N22Utils.java

@@ -2,9 +2,9 @@ package com.yd.rmi.n22.common.utils;
 
 
 import com.google.common.base.Strings;
 import com.google.common.base.Strings;
 import com.yd.rmi.cache.SystemConstants;
 import com.yd.rmi.cache.SystemConstants;
+import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.RequestEntity;
 import org.apache.commons.httpclient.methods.RequestEntity;
 import org.apache.commons.httpclient.methods.StringRequestEntity;
 import org.apache.commons.httpclient.methods.StringRequestEntity;
 import org.apache.commons.httpclient.params.HttpMethodParams;
 import org.apache.commons.httpclient.params.HttpMethodParams;