Merge remote-tracking branch 'origin/dev/KLBstand' into dev/KLBstand

icss-service/src/main/java/com/diagbot/facade/DoctorInfoFacade.java

@@ -46,8 +46,7 @@ public class DoctorInfoFacade {
      */
     public Map<Long, DoctorInfo> doctorInfoMapByIds(List<Long> ids) {
     	 RespDTO<Map<Long, DoctorInfo>> retData = tranServiceClient.doctorInfoMapByIds(ids);
-         if (retData == null
-                 || !CommonErrorCode.OK.getCode().equals(retData.code)) {
+         if (RespDTOUtil.respIsNG(retData)) {
              throw new CommonException(CommonErrorCode.RPC_ERROR,
                      "获取医生信息失败");
          }

icss-service/src/main/java/com/diagbot/facade/HospitalInfoFacade.java

@@ -5,6 +5,7 @@ import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.HospitalInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,8 +49,7 @@ public class HospitalInfoFacade {
         HospitalInfoVO hospitalInfoVO = new HospitalInfoVO();
         hospitalInfoVO.setCode(code);
         RespDTO<List<HospitalInfoDTO>> hospitalInfoDTOList = tranServiceClient.getHospitalInfo(hospitalInfoVO);
-        if (hospitalInfoDTOList == null
-                || !CommonErrorCode.OK.getCode().equals(hospitalInfoDTOList.code)
+        if (RespDTOUtil.respIsNG(hospitalInfoDTOList)
                 || hospitalInfoDTOList.data.size() != 1) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取医院信息失败");

icss-service/src/main/java/com/diagbot/web/DoctorPageModeController.java

@@ -1,26 +1,23 @@
 package com.diagbot.web;
 
 
-import java.util.List;
-
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.DoctorPageModeDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.DoctorPageModeFacade;
 import com.diagbot.vo.DoctorIdVO;
 import com.diagbot.vo.DoctorPageModeVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -32,7 +29,6 @@ import io.swagger.annotations.ApiOperation;
  */
 
 /**
- *
  * @author wangfeng
  * @Description: 医生页面结构设置（文本和半结构） 前端控制器
  * @date 2018年11月20日 下午2:50:40
@@ -51,9 +47,7 @@ public class DoctorPageModeController {
     @SysLogger("saveDoctorPageModes")
     @Transactional
     public RespDTO<Boolean> saveDoctorPageModes(@Valid @RequestBody DoctorPageModeVO doctorPageModeVO) {
-
         boolean res = doctorPageModeFacade.saveDoctorPageMode(doctorPageModeVO);
-
         return RespDTO.onSuc(res);
     }
 
@@ -61,9 +55,7 @@ public class DoctorPageModeController {
     @PostMapping("/getDoctorPageModes")
     @SysLogger("getDoctorPageModes")
     public RespDTO<List<DoctorPageModeDTO>> getDoctorPageModes(@Valid @RequestBody DoctorIdVO doctorIdVO) {
-
-    	List<DoctorPageModeDTO> doctorPageModeData = doctorPageModeFacade.getDoctorPageMode(doctorIdVO);
-
+        List<DoctorPageModeDTO> doctorPageModeData = doctorPageModeFacade.getDoctorPageMode(doctorIdVO);
         return RespDTO.onSuc(doctorPageModeData);
     }
 }

icss-service/src/main/java/com/diagbot/web/EvaluationModuleMappingController.java

@@ -37,9 +37,7 @@ public class EvaluationModuleMappingController {
     @PostMapping("/getEvaluationModules")
     @SysLogger("getEvaluationModules")
     public RespDTO<List<EvaluationModuleMappingDTO>> getEvaluationModules(@Valid @RequestBody EvaluationDiseaseIdVO evaluationDiseaseIdVO) {
-
         List<EvaluationModuleMappingDTO> data = evaluationModuleMappingFacade.getEvaluationModule(evaluationDiseaseIdVO);
-
         return RespDTO.onSuc(data);
     }
 

icss-service/src/main/java/com/diagbot/web/IndexConfigController.java

@@ -39,9 +39,7 @@ public class IndexConfigController {
     @PostMapping("/getindexConfigs")
     @SysLogger("getindexConfigs")
     public RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
-
         List<IndexConfigDTO> data = indexConfigFacade.getindexConfig(indexConfigDiseaseIdVO.getDiseaseId());
-
         return RespDTO.onSuc(data);
     }
 }

icss-service/src/main/java/com/diagbot/web/IndexDataController.java

@@ -42,9 +42,7 @@ public class IndexDataController {
     @PostMapping("/getIndexDatas")
     @SysLogger("getIndexDatas")
     public RespDTO<IndexConfigAndDataDTO> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
-
     	IndexConfigAndDataDTO data = indexDataFacade.getIndexDataAll(indexDataFindVO);
-
         return RespDTO.onSuc(data);
     }
 
@@ -53,9 +51,7 @@ public class IndexDataController {
     @SysLogger("saveIndexDatas")
     @Transactional
     public RespDTO<Boolean> saveIndexDatas(@Valid @RequestBody IndexDataSaveVO indexDataSaveVO) {
-
         boolean res = indexDataFacade.saveIndexDatas(indexDataSaveVO);
-
         return RespDTO.onSuc(res);
     }
 

icss-service/src/main/java/com/diagbot/web/VersionInfoController.java

@@ -32,9 +32,7 @@ public class VersionInfoController {
     @PostMapping("/getVersionInfoAlls")
     @SysLogger("getVersionInfoAlls")
     public RespDTO<VersionWrapperDTO> getVersionInfoAlls() {
-
         VersionWrapperDTO data = versionInfoFacade.getVersionInfoAll();
-
         return RespDTO.onSuc(data);
     }