Merge remote-tracking branch 'origin/dev'

yd-api/src/main/java/com/yd/api/practitioner/PractitionerController.java

@@ -55,12 +55,6 @@ public class PractitionerController {
      */
     @RequestMapping("/login")
     public Object practitionerLogin(@RequestBody PractitionerLoginRequestVO requestVO){
-        GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
-        String[] fontFamilies = ge.getAvailableFontFamilyNames();
-        System.out.println("字体列表:");
-        for (String s : fontFamilies) {
-            System.out.println(s);
-        }
         JsonResult result = new JsonResult();
         PractitionerLoginResponseVO responseVO = practitionerService.practitionerLogin(requestVO);
         result.addResult(responseVO);

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

@@ -136,8 +136,9 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         PayScaleQueryResponseVO responseVO = new PayScaleQueryResponseVO();
         String practitionerIdEG = requestVO.getPractitionerIdEG();
         Long practitionerId = requestVO.getPractitionerId();
+        Map<Long,PayScaleInfo> payScaleInfoMap = new HashMap<>();
 
-        if(!Strings.isNullOrEmpty(practitionerIdEG) && practitionerId != null){
+        if(!Strings.isNullOrEmpty(practitionerIdEG)){
             List<PayScaleInfo> payScaleInfoListAll =  aclPractitionerDALService.findPayScaleByPractitionerEG(practitionerIdEG);
             if(!payScaleInfoListAll.isEmpty()){
                 Map<String,String> dtlTypeMap = new HashMap<>();
@@ -146,7 +147,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                 optionsEGoldenList.forEach(i->dtlTypeMap.put(i.getOptAttr(),i.getOptName()));
                 List<OptionsEGolden> titleList = mdDropOptionsDALService.findAllTitleEG();
                 titleList.forEach(i->titleMap.put(i.getTitleCode(),i.getTitleName()));
-                Map<Long,PayScaleInfo> payScaleInfoMap = new HashMap<>();
+
                 PayScaleInfo payScaleInfo;
                 Long time;
                 for(PayScaleInfo item : payScaleInfoListAll){
@@ -167,21 +168,20 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                 for(PayScaleInfo item : payScaleInfoListAll){
                     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);
             }
-            responseVO.setCommonResult(new CommonResult(true,ZHBErrorConfig.getErrorInfo("800000")));
-        }else{
-            String[] params = {"practitionerIdEG, practitionerId"};
-            responseVO.setCommonResult(new CommonResult(false, ZHBErrorConfig.getErrorInfo("610002", params)));
         }
+        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")));
         return responseVO;
     }