代码整理优化

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

@@ -24,13 +24,13 @@ public class IndexConfigFacade {
     /**
      * 根据疾病Id获取指标配置
      *
-     * @param diseaseId 疾病标签id
+     * @param indexConfigdiseaseNameVO 疾病名称
      * @return
      */
-    public RespDTO<List<IndexConfigDTO>> getindexConfig(IndexConfigdiseaseNameVO indexConfigdiseaseNameVO) {
+    public List<IndexConfigDTO> getindexConfig(IndexConfigdiseaseNameVO indexConfigdiseaseNameVO) {
     	RespDTO<List<IndexConfigDTO>> indexConfigList = aiptServiceClient.getindexConfigs(indexConfigdiseaseNameVO);
     	RespDTOUtil.respNGDeal(indexConfigList, "获取指标配置数据失败！");
-        return indexConfigList;
+        return indexConfigList.data;
     }
 
 

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

@@ -1,17 +1,13 @@
 package com.diagbot.facade;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.IndexConfigAndDataDTO;
-import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.IndexDataFindVO;
 import com.diagbot.vo.IndexDataSaveVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * @author wangfeng
@@ -21,20 +17,19 @@ import com.diagbot.vo.IndexDataSaveVO;
 @Component
 public class IndexDataFacade {
 
-    @Autowired
-    private IndexConfigFacade indexConfigFacade;
     @Autowired
     AiptServiceClient aiptServiceClient;
+
     /**
      * 根据疾病id和用户id，开始时间和结束时间 查询用户指标数据
      *
      * @param indexDataFindVO
      * @return
      */
-    public RespDTO<IndexConfigAndDataDTO> getIndexDataAll(IndexDataFindVO indexDataFindVO) {
-    	RespDTO<IndexConfigAndDataDTO> dataList = aiptServiceClient.getIndexDatas(indexDataFindVO);
-    	RespDTOUtil.respNGDeal(dataList, dataList.msg);
-        return dataList;
+    public IndexConfigAndDataDTO getIndexDataAll(IndexDataFindVO indexDataFindVO) {
+        RespDTO<IndexConfigAndDataDTO> dataList = aiptServiceClient.getIndexDatas(indexDataFindVO);
+        RespDTOUtil.respNGDeal(dataList, dataList.msg);
+        return dataList.data;
     }
 
     /**
@@ -43,9 +38,9 @@ public class IndexDataFacade {
      * @param indexDataSaveVO
      * @return
      */
-    public RespDTO<Boolean> saveIndexDatas(IndexDataSaveVO indexDataSaveVO) {
-    	RespDTO<Boolean> data = aiptServiceClient.saveIndexDatas(indexDataSaveVO);
-    	RespDTOUtil.respNGDeal(data, data.msg);
-        return data;
-    }
+    public Boolean saveIndexDatas(IndexDataSaveVO indexDataSaveVO) {
+        RespDTO<Boolean> data = aiptServiceClient.saveIndexDatas(indexDataSaveVO);
+        RespDTOUtil.respNGDeal(data, data.msg);
+        return data.data;
     }
+}

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

@@ -1,22 +1,20 @@
 package com.diagbot.web;
 
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-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.IndexConfigDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.IndexConfigFacade;
 import com.diagbot.vo.IndexConfigdiseaseNameVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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 java.util.List;
 
 /**
  * <p>
@@ -39,7 +37,7 @@ public class IndexConfigController {
     @PostMapping("/getindexConfigs")
     @SysLogger("getindexConfigs")
     public RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigdiseaseNameVO indexConfigdiseaseNameVO) {
-    	return indexConfigFacade.getindexConfig(indexConfigdiseaseNameVO);
-     
+        return RespDTO.onSuc(indexConfigFacade.getindexConfig(indexConfigdiseaseNameVO));
+
     }
 }

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

@@ -1,26 +1,21 @@
 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.IndexConfigAndDataDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.IndexDataFacade;
 import com.diagbot.vo.IndexDataFindVO;
 import com.diagbot.vo.IndexDataSaveVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import springfox.documentation.annotations.ApiIgnore;
+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;
 
 /**
  * <p>
@@ -44,8 +39,7 @@ public class IndexDataController {
     @PostMapping("/getIndexDatas")
     @SysLogger("getIndexDatas")
     public RespDTO<IndexConfigAndDataDTO> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
-    	return indexDataFacade.getIndexDataAll(indexDataFindVO);
-        
+        return RespDTO.onSuc(indexDataFacade.getIndexDataAll(indexDataFindVO));
     }
 
     @ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]", notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> doctorId：医生id必填<br> IndexData：{指标公表名 :indexUnique;指标值indexValue;指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
@@ -53,8 +47,7 @@ public class IndexDataController {
     @SysLogger("saveIndexDatas")
     @Transactional
     public RespDTO<Boolean> saveIndexDatas(@Valid @RequestBody IndexDataSaveVO indexDataSaveVO) {
-    	return indexDataFacade.saveIndexDatas(indexDataSaveVO);
-        
+        return RespDTO.onSuc(indexDataFacade.saveIndexDatas(indexDataSaveVO));
     }
 
 }