薪资单临时方案问题

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

@@ -136,6 +136,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         PayScaleQueryResponseVO responseVO = new PayScaleQueryResponseVO();
         PayScaleQueryResponseVO responseVO = new PayScaleQueryResponseVO();
         String practitionerIdEG = requestVO.getPractitionerIdEG();
         String practitionerIdEG = requestVO.getPractitionerIdEG();
         Long practitionerId = requestVO.getPractitionerId();
         Long practitionerId = requestVO.getPractitionerId();
+        Map<Long,PayScaleInfo> payScaleInfoMap = new HashMap<>();
 
 
         if(!Strings.isNullOrEmpty(practitionerIdEG) && practitionerId != null){
         if(!Strings.isNullOrEmpty(practitionerIdEG) && practitionerId != null){
             List<PayScaleInfo> payScaleInfoListAll =  aclPractitionerDALService.findPayScaleByPractitionerEG(practitionerIdEG);
             List<PayScaleInfo> payScaleInfoListAll =  aclPractitionerDALService.findPayScaleByPractitionerEG(practitionerIdEG);
@@ -146,7 +147,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                 optionsEGoldenList.forEach(i->dtlTypeMap.put(i.getOptAttr(),i.getOptName()));
                 optionsEGoldenList.forEach(i->dtlTypeMap.put(i.getOptAttr(),i.getOptName()));
                 List<OptionsEGolden> titleList = mdDropOptionsDALService.findAllTitleEG();
                 List<OptionsEGolden> titleList = mdDropOptionsDALService.findAllTitleEG();
                 titleList.forEach(i->titleMap.put(i.getTitleCode(),i.getTitleName()));
                 titleList.forEach(i->titleMap.put(i.getTitleCode(),i.getTitleName()));
-                Map<Long,PayScaleInfo> payScaleInfoMap = new HashMap<>();
+
                 PayScaleInfo payScaleInfo;
                 PayScaleInfo payScaleInfo;
                 Long time;
                 Long time;
                 for(PayScaleInfo item : payScaleInfoListAll){
                 for(PayScaleInfo item : payScaleInfoListAll){
@@ -167,16 +168,19 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                 for(PayScaleInfo item : payScaleInfoListAll){
                 for(PayScaleInfo item : payScaleInfoListAll){
                     item.setMonDtlRAmount(CommonUtil.doubleFormat(item.getMonDtlRAmount(),2));
                     item.setMonDtlRAmount(CommonUtil.doubleFormat(item.getMonDtlRAmount(),2));
                 }
                 }
-                List<PayScaleInfo> resultList = new ArrayList<>(payScaleInfoMap.values());
-
-                // 加入临时薪资表的数据
-                List<AgAclLifePractitionerSalary> list = practitionerSalaryMapper.queryListByPractitionerId(practitionerId);
-                translateObj(list, resultList);
 
 
-                // 排序
-                resultList.sort(Comparator.comparingLong(PayScaleInfo :: getMonDtlPeriod).reversed());
-                responseVO.setPayScaleInfos(resultList);
             }
             }
+
+            List<PayScaleInfo> resultList = new ArrayList<>(payScaleInfoMap.values());
+
+            // 加入临时薪资表的数据
+            List<AgAclLifePractitionerSalary> list = practitionerSalaryMapper.queryListByPractitionerId(practitionerId);
+            translateObj(list, resultList);
+
+            // 排序
+            resultList.sort(Comparator.comparingLong(PayScaleInfo :: getMonDtlPeriod).reversed());
+            responseVO.setPayScaleInfos(resultList);
+
             responseVO.setCommonResult(new CommonResult(true,ZHBErrorConfig.getErrorInfo("800000")));
             responseVO.setCommonResult(new CommonResult(true,ZHBErrorConfig.getErrorInfo("800000")));
         }else{
         }else{
             String[] params = {"practitionerIdEG, practitionerId"};
             String[] params = {"practitionerIdEG, practitionerId"};