Browse Source

代码优化

gaodm 5 years atrás
parent
commit
e3306e3d45
24 changed files with 46 additions and 69 deletions
  1. 1 1
      icss-service/src/main/java/com/diagbot/facade/HospitalInfoFacade.java
  2. 1 1
      icss-service/src/main/java/com/diagbot/web/CacheController.java
  3. 0 1
      icss-service/src/main/java/com/diagbot/web/ConceptDetailController.java
  4. 0 1
      icss-service/src/main/java/com/diagbot/web/DeptInfoController.java
  5. 0 2
      icss-service/src/main/java/com/diagbot/web/DisTypeController.java
  6. 0 1
      icss-service/src/main/java/com/diagbot/web/DiseaseIcdController.java
  7. 2 3
      icss-service/src/main/java/com/diagbot/web/DockingImportController.java
  8. 0 1
      icss-service/src/main/java/com/diagbot/web/DoctorInfoController.java
  9. 0 1
      icss-service/src/main/java/com/diagbot/web/DoctorPageModeController.java
  10. 8 11
      icss-service/src/main/java/com/diagbot/web/EvaluationModuleMappingController.java
  11. 7 9
      icss-service/src/main/java/com/diagbot/web/HospitalInfoController.java
  12. 0 1
      icss-service/src/main/java/com/diagbot/web/IndexConfigController.java
  13. 5 5
      icss-service/src/main/java/com/diagbot/web/IndexDataController.java
  14. 2 2
      icss-service/src/main/java/com/diagbot/web/LisExcelResController.java
  15. 0 1
      icss-service/src/main/java/com/diagbot/web/ModuleInfoController.java
  16. 0 1
      icss-service/src/main/java/com/diagbot/web/PatientInfoController.java
  17. 5 5
      icss-service/src/main/java/com/diagbot/web/PrintRecordController.java
  18. 0 1
      icss-service/src/main/java/com/diagbot/web/QuestionInfoController.java
  19. 0 1
      icss-service/src/main/java/com/diagbot/web/QuestionUsualController.java
  20. 0 1
      icss-service/src/main/java/com/diagbot/web/RetrievalController.java
  21. 0 2
      icss-service/src/main/java/com/diagbot/web/ScaleController.java
  22. 10 11
      icss-service/src/main/java/com/diagbot/web/SysSetController.java
  23. 5 5
      icss-service/src/main/java/com/diagbot/web/TemplateInfoController.java
  24. 0 1
      icss-service/src/main/java/com/diagbot/web/TranFieldInfoController.java

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

@@ -27,7 +27,7 @@ public class HospitalInfoFacade {
     /**
      * 获取医院信息
      *
-     * @param hospitalInfoVO
+     * @param hospitalSetVO
      * @return
      */
     public HospitalInfoDTO getHospitalInfo(HospitalSetVO hospitalSetVO) {

+ 1 - 1
icss-service/src/main/java/com/diagbot/web/CacheController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * @Description: 电子病历评级
+ * @Description: 清理缓存控制层
  * @Author:gaodm
  * @time: 2019/5/22 15:07
  */

+ 0 - 1
icss-service/src/main/java/com/diagbot/web/ConceptDetailController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.dto.RespDTO;

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

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.RespDTO;

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

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.diagbot.dto.DisTypeDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.DisTypeFacade;
@@ -25,7 +24,6 @@ import org.springframework.web.bind.annotation.RestController;
 @SuppressWarnings("unchecked")
 public class DisTypeController {
 
-
     @Autowired
     DisTypeFacade disTypeFacade;
 

+ 0 - 1
icss-service/src/main/java/com/diagbot/web/DiseaseIcdController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.DiseaseIcdDTO;
 import com.diagbot.dto.RespDTO;

+ 2 - 3
icss-service/src/main/java/com/diagbot/web/DockingImportController.java

@@ -13,15 +13,14 @@ import com.diagbot.vo.PacsArgumentsVO;
 import com.diagbot.vo.PacsCheckItemVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
-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 javax.validation.Valid;
+
 /**
  * @author wangfeng
  * @Description: TODO

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

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.DoctorInfoDTO;
 import com.diagbot.dto.RespDTO;

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

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.DoctorPageModeDTO;
 import com.diagbot.dto.RespDTO;

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

@@ -1,23 +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.EvaluationDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.EvaluationModuleMappingFacade;
 import com.diagbot.vo.EvaluationDiseaseNameVO;
-
 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>

+ 7 - 9
icss-service/src/main/java/com/diagbot/web/HospitalInfoController.java

@@ -1,21 +1,19 @@
 package com.diagbot.web;
 
-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.HospitalInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.HospitalInfoFacade;
 import com.diagbot.vo.HospitalSetVO;
-
 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;
 
 /**
  * @Description:

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

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.IndexConfigDTO;
 import com.diagbot.dto.RespDTO;

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

@@ -36,8 +36,8 @@ public class IndexDataController {
     IndexDataFacade indexDataFacade;
 
     @ApiOperation(value = "知识库标准化-根据疾病获取指标数据[by:wangfeng]",
-                  notes = "diseaseName:疾病名 必填<br> patientId:患者id ,必填<br> " +
-                          "startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
+            notes = "diseaseName:疾病名 必填<br> patientId:患者id ,必填<br> " +
+                    "startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
     @PostMapping("/getIndexDatas")
     @SysLogger("getIndexDatas")
     public RespDTO<IndexConfigAndDataDTO> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
@@ -45,9 +45,9 @@ public class IndexDataController {
     }
 
     @ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]",
-                  notes = "patientId : 患者id 必填<br> inquiryCode :就诊号  必填<br> doctorId:" +
-                          "医生id必填<br> IndexData:{指标公表名 :indexUnique;指标值indexValue;" +
-                          "指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
+            notes = "patientId : 患者id 必填<br> inquiryCode :就诊号  必填<br> doctorId:" +
+                    "医生id必填<br> IndexData:{指标公表名 :indexUnique;指标值indexValue;" +
+                    "指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
     @PostMapping("/saveIndexDatas")
     @SysLogger("saveIndexDatas")
     @Transactional

+ 2 - 2
icss-service/src/main/java/com/diagbot/web/LisExcelResController.java

@@ -29,9 +29,9 @@ public class LisExcelResController {
     LisExcelResFacade lisExcelResFacade;
 
     @ApiOperation(value = "导入化验数据:[by:wangfeng]", notes = "导入化验数据")
-    @PostMapping(value = "/lisExcelAnalysis", produces="text/html;charset=utf-8")
+    @PostMapping(value = "/lisExcelAnalysis", produces = "text/html;charset=utf-8")
     public String lisExcelAnalysis(@RequestParam("uploadfile") MultipartFile file, LisHospitalCodeVO lisHospitalCodeVO,
                                    HttpServletRequest request) {
-        return GsonUtil.toJson(lisExcelResFacade.lisExcelAnalysis(file,lisHospitalCodeVO, request));
+        return GsonUtil.toJson(lisExcelResFacade.lisExcelAnalysis(file, lisHospitalCodeVO, request));
     }
 }

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

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.diagbot.dto.ModuleInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ModuleFacade;

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

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;

+ 5 - 5
icss-service/src/main/java/com/diagbot/web/PrintRecordController.java

@@ -30,11 +30,11 @@ public class PrintRecordController {
     PrintRecordFacade printRecordFacade;
 
     @ApiOperation(value = "保存打印记录[by:wangfeng]",
-                  notes = "疾病名称 :name</br>医生id:doctorId</br>医院编码 : hospitalId</br>" +
-                          "患者id:patientId</br>" +
-                          "医院部门id:hospitalDeptId</br> 问诊号:inquiryCode</br>文本内容 :content </br>" +
-                          "{chief;//主诉present;//现病史other;//其他史vital;//查体lis;//化验pacs;//辅检diag;//诊断advice;//医嘱}</br>" +
-                          "dataJson:内容JSON字符串(打印页面展示)")
+            notes = "疾病名称 :name</br>医生id:doctorId</br>医院编码 : hospitalId</br>" +
+                    "患者id:patientId</br>" +
+                    "医院部门id:hospitalDeptId</br> 问诊号:inquiryCode</br>文本内容 :content </br>" +
+                    "{chief;//主诉present;//现病史other;//其他史vital;//查体lis;//化验pacs;//辅检diag;//诊断advice;//医嘱}</br>" +
+                    "dataJson:内容JSON字符串(打印页面展示)")
     @PostMapping("/savePrintRecords")
     @SysLogger("savePrintRecords")
     @Transactional

+ 0 - 1
icss-service/src/main/java/com/diagbot/web/QuestionInfoController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.diagbot.dto.QuestionDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.QuestionFacade;

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

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.QuestionUsualDTO;
 import com.diagbot.dto.RespDTO;

+ 0 - 1
icss-service/src/main/java/com/diagbot/web/RetrievalController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.RetrievalDTO;

+ 0 - 2
icss-service/src/main/java/com/diagbot/web/ScaleController.java

@@ -1,7 +1,5 @@
 package com.diagbot.web;
 
-
-import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.DisScaleDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.ScaleIndexDTO;

+ 10 - 11
icss-service/src/main/java/com/diagbot/web/SysSetController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SysSetInfoDTO;
@@ -31,16 +30,16 @@ import java.util.List;
 @SuppressWarnings("unchecked")
 public class SysSetController {
 
-	@Autowired
-	SysSetFacade sysSetFacade;
-	
-	@ApiOperation(value = "根据医院编码获取配置信息[by:wangfeng]", notes = "hospitalCode :医院code  必填<br> ")
-	@PostMapping("/getSysSetInfoDatas")
-	@SysLogger("getSysSetInfoDatas")
-	public RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid @RequestBody HospitalSetVO hospitalSetVO) {
+    @Autowired
+    SysSetFacade sysSetFacade;
+
+    @ApiOperation(value = "根据医院编码获取配置信息[by:wangfeng]", notes = "hospitalCode :医院code  必填<br> ")
+    @PostMapping("/getSysSetInfoDatas")
+    @SysLogger("getSysSetInfoDatas")
+    public RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid @RequestBody HospitalSetVO hospitalSetVO) {
 
-		 List<SysSetInfoDTO> data = sysSetFacade.getSysSetInfoData(hospitalSetVO);
+        List<SysSetInfoDTO> data = sysSetFacade.getSysSetInfoData(hospitalSetVO);
 
-		return RespDTO.onSuc(data);
-	}
+        return RespDTO.onSuc(data);
+    }
 }

+ 5 - 5
icss-service/src/main/java/com/diagbot/web/TemplateInfoController.java

@@ -63,11 +63,11 @@ public class TemplateInfoController {
     }
 
 
-    @ApiOperation(value = "保存病历模板[by:wangfeng]", notes = "modeName;//模板名字</br>"+
-             "doctorId;//医生id</br>hospitalId;//医院id</br>hospitalDeptId;//部门id</br>"+
-             "modeType;//模板类型</br>preview;//预览文本</br>" +
-             "{chief;//主诉present;//现病史other;//其他史vital;//查体lis;//化验pacs;//辅检diag;//诊断advice;//医嘱}</br>" +
-             "dataJson;//模板数据</br>")
+    @ApiOperation(value = "保存病历模板[by:wangfeng]", notes = "modeName;//模板名字</br>" +
+            "doctorId;//医生id</br>hospitalId;//医院id</br>hospitalDeptId;//部门id</br>" +
+            "modeType;//模板类型</br>preview;//预览文本</br>" +
+            "{chief;//主诉present;//现病史other;//其他史vital;//查体lis;//化验pacs;//辅检diag;//诊断advice;//医嘱}</br>" +
+            "dataJson;//模板数据</br>")
     @PostMapping("/saveTemplateInfo")
     @SysLogger("saveTemplateInfo")
     @Transactional

+ 0 - 1
icss-service/src/main/java/com/diagbot/web/TranFieldInfoController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TranFieldInfoDTO;