Merge branch 'dev/diagbotcloud20190918_vital' into dev/diagbotcloud20190924_diagnose2

aipt-service/src/main/java/com/diagbot/facade/TreatmentFacade.java

@@ -139,8 +139,11 @@ public class TreatmentFacade {
                     retMap.put("surgeryTreatment", conceptDetailDTO);
                 }
             }
-        } else {
+        }
+        if (!retMap.containsKey("commonTreatment")) {
             retMap.put("commonTreatment", null);
+        }
+        if (!retMap.containsKey("surgeryTreatment")) {
             retMap.put("surgeryTreatment", null);
         }
 

gateway-service/src/main/java/com/diagbot/client/hystrix/DiagbotmanServiceHystrix.java

@@ -4,11 +4,14 @@ package com.diagbot.client.hystrix;
 import com.diagbot.client.DiagbotmanServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.HasPermissionDTO;
+import com.diagbot.entity.ServiceFilter;
 import com.diagbot.entity.ServiceToken;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 /**
  * @Description: 产品服务客户端（请求失败熔断）
  * @Author: ztg
@@ -19,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 public class DiagbotmanServiceHystrix implements DiagbotmanServiceClient {
 
     @Override
-    public RespDTO getAll() {
+    public RespDTO<List<ServiceFilter>> getAll() {
         log.error("【hystrix】调用{}异常", "getAll");
         return null;
     }

gateway-service/src/main/java/com/diagbot/filter/GlobalGatewayFilter.java

@@ -60,7 +60,8 @@ public class GlobalGatewayFilter implements GlobalFilter {
     @Override
     public Mono<Void> filter(ServerWebExchange serverWebExchange, GatewayFilterChain gatewayFilterChain) {
         log.info("check token and url permission....");
-        LinkedHashSet requiredAttribute = serverWebExchange.getRequiredAttribute(ServerWebExchangeUtils.GATEWAY_ORIGINAL_REQUEST_URL_ATTR);
+        LinkedHashSet requiredAttribute
+                = serverWebExchange.getRequiredAttribute(ServerWebExchangeUtils.GATEWAY_ORIGINAL_REQUEST_URL_ATTR);
         ServerHttpRequest request = serverWebExchange.getRequest();
         String requestUri = request.getPath().pathWithinApplication().value();
         String serviceName = "";
@@ -70,7 +71,8 @@ public class GlobalGatewayFilter implements GlobalFilter {
                 URI next = iterator.next();
                 if (next.getPath().startsWith(GATE_WAY_PREFIX)) {
                     requestUri = next.getPath().substring(GATE_WAY_PREFIX.length());
-                    serviceName = requestUri.substring(requestUri.indexOf('/') + 1, requestUri.indexOf('/', 2));
+                    serviceName = requestUri.substring(requestUri.indexOf('/') + 1,
+                            requestUri.indexOf('/', 2));
                 }
             }
         }
@@ -90,9 +92,6 @@ public class GlobalGatewayFilter implements GlobalFilter {
         //            }
         //        }
 
-
-
-
         Map<String, Long> serviceFilters = this.dealServiceFilter();
         if (serviceFilters.get(serviceName) != null) {
             String appkey = request.getHeaders().getFirst("appKeyId");
@@ -104,7 +103,7 @@ public class GlobalGatewayFilter implements GlobalFilter {
                 Long curTime = new Date().getTime();
                 // 防伪码主要是为了防止别人窃取url地址后直接长期使用，这边设了失效，目前暂定为24小时
                 // 前端实时获取当前时间跟系统时间作比较，如果时差超出24小时将会抛异常
-                if((curTime - time) > 1000 * 3600 * 24) {
+                if ((curTime - time) > 1000 * 3600 * 24) {
                     RespDTO respDTO = new RespDTO();
                     respDTO.code = CommonErrorCode.SECURITYCODE_ERROR.getCode();
                     respDTO.msg = CommonErrorCode.SECURITYCODE_ERROR.getMsg();

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) {

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
  */

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;

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;

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;
 

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;

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

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;

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;

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>

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:

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;

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

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));
     }
 }

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;

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;

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

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;

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;

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;

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;

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);
+    }
 }

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

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;

icssman-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -302,38 +302,41 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
      */
     public Map<String, Long> getNameMap(List<QuestionMappingWrapper> questionMappings, Date now,
                                         String person, Integer type) {
+        Map<String, Long> map = new HashMap<>();
         List<String> nameList = questionMappings.stream().filter(row -> StringUtil.isNotEmpty(row.getText()))
                 .map(row -> row.getText()).collect(Collectors.toList());
-        List<QuestionInfo> questionInfos = this.list(new QueryWrapper<QuestionInfo>()
-                .eq("type", type)
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("tag_type", TagTypeEnum.T8.getKey())
-                .in("name", nameList)
-        );
-        Map<String, Long> map = questionInfos.stream()
-                .collect(Collectors.toMap(row -> row.getName(), row -> row.getId(), (k1, k2) -> k1));
-        List<QuestionInfo> addBatch = new ArrayList<>();
-        List<String> nameExist = new ArrayList<>();
-        for (String s : nameList) {
-            if (map.get(s) == null && !nameExist.contains(s)) {
-                nameExist.add(s);
-                QuestionInfo bean = new QuestionInfo();
-                bean.setModifier(person);
-                bean.setCreator(person);
-                bean.setGmtCreate(now);
-                bean.setGmtModified(now);
-                bean.setTagType(TagTypeEnum.T8.getKey());
-                bean.setTagName(s);
-                bean.setName(s);
-                bean.setType(type);
-                bean.setSubType(1); //描述类型
-                addBatch.add(bean);
+        if (ListUtil.isNotEmpty(nameList)) {
+            List<QuestionInfo> questionInfos = this.list(new QueryWrapper<QuestionInfo>()
+                    .eq("type", type)
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("tag_type", TagTypeEnum.T8.getKey())
+                    .in("name", nameList)
+            );
+            map = questionInfos.stream()
+                    .collect(Collectors.toMap(row -> row.getName(), row -> row.getId(), (k1, k2) -> k1));
+            List<QuestionInfo> addBatch = new ArrayList<>();
+            List<String> nameExist = new ArrayList<>();
+            for (String s : nameList) {
+                if (map.get(s) == null && !nameExist.contains(s)) {
+                    nameExist.add(s);
+                    QuestionInfo bean = new QuestionInfo();
+                    bean.setModifier(person);
+                    bean.setCreator(person);
+                    bean.setGmtCreate(now);
+                    bean.setGmtModified(now);
+                    bean.setTagType(TagTypeEnum.T8.getKey());
+                    bean.setTagName(s);
+                    bean.setName(s);
+                    bean.setType(type);
+                    bean.setSubType(1); //描述类型
+                    addBatch.add(bean);
+                }
             }
-        }
-        questionInfoService.saveBatch(addBatch); //批量插入question
-        for (QuestionInfo bean : addBatch) {
-            if (map.get(bean.getName()) == null) {
-                map.put(bean.getName(), bean.getId());
+            questionInfoService.saveBatch(addBatch); //批量插入question
+            for (QuestionInfo bean : addBatch) {
+                if (map.get(bean.getName()) == null) {
+                    map.put(bean.getName(), bean.getId());
+                }
             }
         }
         return map;