隐藏用不到的接口，标注二期新增和修改的接口

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

@@ -13,6 +13,7 @@ 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 springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
 
@@ -28,7 +29,7 @@ import javax.validation.Valid;
 @RequestMapping("/deptInfo")
 @Api(value = "科室信息API", tags = { "科室信息API" })
 @SuppressWarnings("unchecked")
-/*@ApiIgnore*/
+@ApiIgnore
 public class DeptInfoController {
 
     @Autowired

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

@@ -28,7 +28,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/scale")
-@Api(value = "诊断量表API", tags = { "诊断量表API" })
+@Api(value = "诊断量表API", tags = { "2期-诊断量表API" })
 @SuppressWarnings("unchecked")
 public class DisScaleController {
 

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

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/disType")
-@Api(value = "诊断类型API", tags = { "诊断类型API" })
+@Api(value = "诊断类型API", tags = { "2期-诊断类型API" })
 @SuppressWarnings("unchecked")
 public class DisTypeController {
 

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

@@ -13,6 +13,7 @@ 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 springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -29,7 +30,7 @@ import java.util.List;
 @RequestMapping("/doctorInfo")
 @Api(value = "医生信息API", tags = { "医生信息API" })
 @SuppressWarnings("unchecked")
-/*@ApiIgnore*/
+@ApiIgnore
 public class DoctorInfoController {
 
     @Autowired

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

@@ -1,24 +1,20 @@
 package com.diagbot.web;
 
-import java.util.List;
-
-import javax.validation.Valid;
-
-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.EvaluationModuleMappingDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.EvaluationModuleMappingFacade;
 import com.diagbot.vo.EvaluationDiseaseIdVO;
-import com.diagbot.vo.PushVO;
-
 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 javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -34,17 +30,17 @@ import io.swagger.annotations.ApiOperation;
 @SuppressWarnings("unchecked")
 public class EvaluationModuleMappingController {
 
-	@Autowired
-	EvaluationModuleMappingFacade evaluationModuleMappingFacade;
+    @Autowired
+    EvaluationModuleMappingFacade evaluationModuleMappingFacade;
 
-	@ApiOperation(value = "获取管理与评估模板[by:wangfeng]", notes = "获取管理与评估模板")
-	@PostMapping("/getEvaluationModules")
-	@SysLogger("getEvaluationModules")
-	public RespDTO<List<EvaluationModuleMappingDTO>> getEvaluationModules(@Valid @RequestBody EvaluationDiseaseIdVO evaluationDiseaseIdVO) {
+    @ApiOperation(value = "获取管理与评估模板[by:wangfeng]", notes = "获取管理与评估模板")
+    @PostMapping("/getEvaluationModules")
+    @SysLogger("getEvaluationModules")
+    public RespDTO<List<EvaluationModuleMappingDTO>> getEvaluationModules(@Valid @RequestBody EvaluationDiseaseIdVO evaluationDiseaseIdVO) {
 
-		List<EvaluationModuleMappingDTO> data = evaluationModuleMappingFacade.getEvaluationModule(evaluationDiseaseIdVO);
+        List<EvaluationModuleMappingDTO> data = evaluationModuleMappingFacade.getEvaluationModule(evaluationDiseaseIdVO);
 
-		return RespDTO.onSuc(data);
-	}
+        return RespDTO.onSuc(data);
+    }
 
 }

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

@@ -1,28 +1,24 @@
 package com.diagbot.web;
 
 
-import java.util.List;
-
-import javax.validation.Valid;
-
-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.IndexConfigDiseaseIdVO;
-
 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>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author wangfeng
@@ -34,16 +30,16 @@ import io.swagger.annotations.ApiOperation;
 @SuppressWarnings("unchecked")
 public class IndexConfigController {
 
-	@Autowired
-	IndexConfigFacade indexConfigFacade;
-	
-	@ApiOperation(value = "根据疾病Id获取指标配置[by:wangfeng]", notes = "根据疾病Id获取指标配置")
-	@PostMapping("/getindexConfigs")
-	@SysLogger("getindexConfigs")
-	public RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
+    @Autowired
+    IndexConfigFacade indexConfigFacade;
+
+    @ApiOperation(value = "根据疾病Id获取指标配置[by:wangfeng]", notes = "根据疾病Id获取指标配置")
+    @PostMapping("/getindexConfigs")
+    @SysLogger("getindexConfigs")
+    public RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
 
-		List<IndexConfigDTO> data = indexConfigFacade.getindexConfig(indexConfigDiseaseIdVO.getDiseaseId());
+        List<IndexConfigDTO> data = indexConfigFacade.getindexConfig(indexConfigDiseaseIdVO.getDiseaseId());
 
-		return RespDTO.onSuc(data);
-	}
+        return RespDTO.onSuc(data);
+    }
 }

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

@@ -1,26 +1,22 @@
 package com.diagbot.web;
 
-import java.util.List;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-
-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.ItemIndexDTO;
 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 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>
@@ -28,7 +24,6 @@ import io.swagger.annotations.ApiOperation;
  * </p>
  *
  * @author wangfeng
- * 
  * @since 2019-03-11
  */
 
@@ -38,29 +33,29 @@ import io.swagger.annotations.ApiOperation;
 @SuppressWarnings("unchecked")
 public class IndexDataController {
 
-	@Autowired
-	IndexDataFacade indexDataFacade;
+    @Autowired
+    IndexDataFacade indexDataFacade;
 
-	@ApiOperation(value = "根据疾病Id获取指标配置[by:wangfeng]", notes = "diseaseId：疾病Id 必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
-	@PostMapping("/getIndexDatas")
-	@SysLogger("getIndexDatas")
-	@Transactional
-	public RespDTO<List<ItemIndexDTO>> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
+    @ApiOperation(value = "根据疾病Id获取指标配置[by:wangfeng]", notes = "diseaseId：疾病Id 必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
+    @PostMapping("/getIndexDatas")
+    @SysLogger("getIndexDatas")
+    @Transactional
+    public RespDTO<List<ItemIndexDTO>> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
 
-		List<ItemIndexDTO> data = indexDataFacade.getIndexDataAll(indexDataFindVO);
+        List<ItemIndexDTO> data = indexDataFacade.getIndexDataAll(indexDataFindVO);
 
-		return RespDTO.onSuc(data);
-	}
+        return RespDTO.onSuc(data);
+    }
 
-	@ApiOperation(value = "保存指标数据[by:wangfeng]", notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> doctorId：医生id必填<br> IndexData：{指标公表名 :indexUnique;指标值indexValue;指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
-	@PostMapping("/saveIndexDatas")
-	@SysLogger("saveIndexDatas")
-	@Transactional
-	public RespDTO<Boolean> saveIndexDatas(@Valid @RequestBody IndexDataSaveVO indexDataSaveVO) {
+    @ApiOperation(value = "保存指标数据[by:wangfeng]", notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> doctorId：医生id必填<br> IndexData：{指标公表名 :indexUnique;指标值indexValue;指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
+    @PostMapping("/saveIndexDatas")
+    @SysLogger("saveIndexDatas")
+    @Transactional
+    public RespDTO<Boolean> saveIndexDatas(@Valid @RequestBody IndexDataSaveVO indexDataSaveVO) {
 
-		boolean res = indexDataFacade.saveIndexDatas(indexDataSaveVO);
+        boolean res = indexDataFacade.saveIndexDatas(indexDataSaveVO);
 
-		return RespDTO.onSuc(res);
-	}
+        return RespDTO.onSuc(res);
+    }
 
 }

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

@@ -1,17 +1,6 @@
 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.GetEvaluationScalesDTO;
 import com.diagbot.dto.GetEvaluationsDTO;
@@ -31,11 +20,19 @@ import com.diagbot.vo.HisInquirysForDjVO;
 import com.diagbot.vo.HisInquirysVO;
 import com.diagbot.vo.ReadInquiryVO;
 import com.diagbot.vo.SaveInquiryVO;
-
 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 springfox.documentation.annotations.ApiIgnore;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * @author rengb
  * @since 2018-11-23
@@ -63,7 +60,7 @@ public class InquiryInfoController {
     public RespDTO<ReadInquiryDTO> readInquiry(@Valid @RequestBody ReadInquiryVO readInquiryVO) {
         return RespDTO.onSuc(inquiryInfoFacade.readInquiry(readInquiryVO));
     }
-    
+
     @ApiOperation(value = "获取最近一次其他史信息[by:rengb]")
     @PostMapping("/getLastOther")
     @SysLogger("getLastOther")
@@ -77,7 +74,7 @@ public class InquiryInfoController {
     public RespDTO<List<HisInquiryDTO>> hisInquirys(@Valid @RequestBody HisInquirysVO hisInquirysVO) {
         return RespDTO.onSuc(inquiryInfoFacade.hisInquirys(hisInquirysVO));
     }
-    
+
     @ApiOperation(value = "对接-历史病历列表[by:rengb]")
     @PostMapping("/hisInquirysForDj")
     @SysLogger("hisInquirysForDj")
@@ -92,15 +89,15 @@ public class InquiryInfoController {
     public RespDTO<GetInquiryDetailDTO> getInquiryDetail(@Valid @RequestBody GetInquiryDetailVO getInquiryDetailVO) {
         return RespDTO.onSuc(inquiryInfoFacade.getInquiryDetail(getInquiryDetailVO));
     }
-    
-    @ApiOperation(value = "获取评估结果[by:rengb]")
+
+    @ApiOperation(value = "2期-获取评估结果[by:rengb]")
     @PostMapping("/getEvaluations")
     @SysLogger("getEvaluations")
     public RespDTO<List<GetEvaluationsDTO>> getEvaluations(@Valid @RequestBody GetEvaluationsVO getEvaluationsVO) {
         return RespDTO.onSuc(inquiryInfoFacade.getEvaluations(getEvaluationsVO));
     }
-    
-    @ApiOperation(value = "获取评估量表接口[by:rengb]")
+
+    @ApiOperation(value = "2期-获取评估量表接口[by:rengb]")
     @PostMapping("/getEvaluationScales")
     @SysLogger("getEvaluationScales")
     public RespDTO<List<GetEvaluationScalesDTO>> getEvaluationScales(@Valid @RequestBody GetEvaluationScalesVO getEvaluationScalesVO) {

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

@@ -32,7 +32,7 @@ public class ModuleInfoController {
     @Autowired
     ModuleFacade moduleFacade;
 
-    @ApiOperation(value = "返回所有的模型数据[by:zhoutg]",
+    @ApiOperation(value = "2期-返回所有的模型数据[by:wangyu]",
             notes = "moduleType: 模板类型(0.通用 1.根据科室划分 2.慢病)<br>" +
                     "relationId: 关联id，当moduleType为0时传0,当moduleType为1时，传科室id，当moduleType为2时传疾病id<br>" +
                     "<br>")

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

@@ -15,6 +15,7 @@ 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 springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
 
@@ -39,7 +40,7 @@ public class PatientInfoController {
                     "hospitalCode:医院编号，必填<br>")
     @PostMapping("/getPatientInfo")
     @SysLogger("getPatientInfo")
-    /*@ApiIgnore*/
+    @ApiIgnore
     public RespDTO<PatientInfoDTO> getPatientInfo(@Valid @RequestBody PatientInfoVO patientInfoVO) {
         PatientInfoDTO data = patientInfoFacade.getPatientInfo(patientInfoVO);
         return RespDTO.onSuc(data);

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

@@ -38,7 +38,7 @@ public class PushController {
     @Autowired
     PushFacade pushFacade;
 
-    @ApiOperation(value = "推理接口(半结构化)[by:zhaops]",
+    @ApiOperation(value = "2期-推理接口(半结构化)[by:zhaops]",
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别(必填)，1：男，2：女<br>" +
                     "symptom：症状,String<br>" +

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

@@ -34,7 +34,7 @@ public class QuestionUsualController {
     @Autowired
     private QuestionUsualFacade questionUsualFacade;
 
-    @ApiOperation(value = "常用标签——根据科室获取常用标签[by:wangyu]",
+    @ApiOperation(value = "2期-常用标签——根据科室获取常用标签[by:wangyu]",
             notes = "deptCode：科室id<br>" +
                     "age：年龄<br>" +
                     "sexType: 性别<br>" +

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

@@ -39,7 +39,7 @@ public class TranDiseaseIcdController {
     @PostMapping("/getDiseaseIcds")
     @SysLogger("getDiseaseIcds")
     /*@ApiIgnore*/
-    public RespDTO<List<GetDiseaseIcdDTO>> getDiseaseIcds(@RequestBody @Valid GetDiseaseIcdVO getDiseaseIcdVO){
+    public RespDTO<List<GetDiseaseIcdDTO>> getDiseaseIcds(@RequestBody @Valid GetDiseaseIcdVO getDiseaseIcdVO) {
         List<GetDiseaseIcdDTO> data = tranDiseaseIcdFacade.getDiseaseIcds(getDiseaseIcdVO);
         return RespDTO.onSuc(data);
     }