代码格式化和标准化

prec-service/src/main/java/com/diagbot/PrecServiceApplication.java

@@ -14,7 +14,7 @@ import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboar
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
- * @Description: BI服务启动文件
+ * @Description: 智能预问诊服务启动文件
  * @author: gaodm
  * @time: 2018/8/7 9:24
  */

prec-service/src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -2,13 +2,9 @@ package com.diagbot.facade;
 
 import com.diagbot.client.bean.SearchData;
 import com.diagbot.enums.SysTypeEnum;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.ListUtil;
 import com.diagbot.vo.PushVO;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author:zhaops

prec-service/src/main/java/com/diagbot/facade/InquiryDetailFacade.java

@@ -1,8 +1,7 @@
 package com.diagbot.facade;
 
-import org.springframework.stereotype.Component;
-
 import com.diagbot.service.impl.InquiryDetailServiceImpl;
+import org.springframework.stereotype.Component;
 
 /**
  * @author: zhoutg
@@ -11,6 +10,4 @@ import com.diagbot.service.impl.InquiryDetailServiceImpl;
 @Component
 public class InquiryDetailFacade extends InquiryDetailServiceImpl {
 
-    
-
 }

prec-service/src/main/java/com/diagbot/facade/InquiryEvaluatorFacade.java

@@ -1,16 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.assertj.core.util.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.EvaluatorCalDTO;
@@ -32,6 +21,16 @@ import com.diagbot.util.ListUtil;
 import com.diagbot.vo.AddEvaluatorVO;
 import com.diagbot.vo.EvaluatorCalVO;
 import com.diagbot.vo.GetEvaluatorPageVO;
+import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author: zhoutg
@@ -39,16 +38,17 @@ import com.diagbot.vo.GetEvaluatorPageVO;
  */
 @Component
 public class InquiryEvaluatorFacade extends InquiryEvaluatorServiceImpl {
-	@Autowired
+    @Autowired
     private PhysicalInfoFacade physicalInfoFacade;
-	@Autowired
+    @Autowired
     private InquiryInfoFacade inquiryInfoFacade;
 
-	/**
-	 * 儿童体质辨识--添加
-	 * @param addDeptInfoVO
-	 * @return
-	 */
+    /**
+     * 儿童体质辨识--添加
+     *
+     * @param addEvaluatorVO
+     * @return
+     */
     public Boolean addEvaluator(AddEvaluatorVO addEvaluatorVO) {
         QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<>();
         inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
@@ -58,18 +58,18 @@ public class InquiryEvaluatorFacade extends InquiryEvaluatorServiceImpl {
         inquiryInfoQe.eq("patient_id", addEvaluatorVO.getPatientId());
         inquiryInfoQe.eq("inquiry_code", addEvaluatorVO.getInquiryCode());
         InquiryInfo inquiryInfo = inquiryInfoFacade.getOne(inquiryInfoQe);
-        
+
         Date now = DateUtil.now();
-        
-        if(inquiryInfo==null){
-        	inquiryInfo = new InquiryInfo();
-        	inquiryInfo.setGmtCreate(now);
+
+        if (inquiryInfo == null) {
+            inquiryInfo = new InquiryInfo();
+            inquiryInfo.setGmtCreate(now);
         }
-        
+
         BeanUtil.copyProperties(addEvaluatorVO, inquiryInfo);
         inquiryInfo.setGmtModified(now);
         inquiryInfoFacade.saveOrUpdate(inquiryInfo);
-        
+
         EvaluatorCalVO evaluatorCalVO = new EvaluatorCalVO();
         BeanUtil.copyProperties(addEvaluatorVO, evaluatorCalVO);
         EvaluatorCalDTO evaluatorCalDTO = evaluatorCalPrav(evaluatorCalVO);
@@ -79,121 +79,125 @@ public class InquiryEvaluatorFacade extends InquiryEvaluatorServiceImpl {
         inquiryEvaluator.setInquiryId(inquiryInfo.getId());
         inquiryEvaluator.setGmtCreate(now);
         inquiryEvaluator.setGmtModified(now);
-        
+
         if (!save(inquiryEvaluator)) {
             throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "评估结果提交失败！");
         }
-        
+
         return true;
     }
-    
+
     /**
      * 儿童体质辨识--体质计算
+     *
      * @param evaluatorCalVO
      * @return
      */
-    public EvaluatorCalDTO evaluatorCal(EvaluatorCalVO evaluatorCalVO){
-    	EvaluatorCalDTO evaluatorCalDTO = evaluatorCalPrav(evaluatorCalVO);
-        evaluatorCalDTO.setPhysicalInfoList(Lists.newArrayList(physicalInfoFacade.listByIds(Arrays.asList(evaluatorCalDTO.getPhysicalTypes().split(",")).stream().map(i->Integer.parseInt(i)).collect(Collectors.toList()))));
+    public EvaluatorCalDTO evaluatorCal(EvaluatorCalVO evaluatorCalVO) {
+        EvaluatorCalDTO evaluatorCalDTO = evaluatorCalPrav(evaluatorCalVO);
+        evaluatorCalDTO.setPhysicalInfoList(Lists.newArrayList(physicalInfoFacade.listByIds(Arrays.asList(evaluatorCalDTO.getPhysicalTypes().split(",")).stream().map(i -> Integer.parseInt(i)).collect(Collectors.toList()))));
         return evaluatorCalDTO;
     }
-    
+
     /**
      * 儿童体质辨识--获取分页信息
+     *
      * @param getEvaluatorPageVO
      * @return
      */
-    public IPage<GetEvaluatorPageDTO> getEvaluatorPage(GetEvaluatorPageVO getEvaluatorPageVO){
-    	IPage<GetEvaluatorPageDTO> ipage = this.baseMapper.getEvaluatorPage(getEvaluatorPageVO);
-    	if(ListUtil.isNotEmpty(ipage.getRecords())){
-    		Map<String, PhysicalInfo> physicalInfoMap = physicalInfoFacade.getPhysicalMap();
-    		ipage.getRecords().forEach(getEvaluatorPageDTO->{
-    			getEvaluatorPageDTO.setSexName(SexEnum.getName(getEvaluatorPageDTO.getSex()));
-    			getEvaluatorPageDTO.setAge(DateUtil.yearCompare(getEvaluatorPageDTO.getBirthday(), DateUtil.now()));
-    			
-    			String[] physicalTypes = getEvaluatorPageDTO.getPhysicalTypes().split(",");
+    public IPage<GetEvaluatorPageDTO> getEvaluatorPage(GetEvaluatorPageVO getEvaluatorPageVO) {
+        IPage<GetEvaluatorPageDTO> ipage = this.baseMapper.getEvaluatorPage(getEvaluatorPageVO);
+        if (ListUtil.isNotEmpty(ipage.getRecords())) {
+            Map<String, PhysicalInfo> physicalInfoMap = physicalInfoFacade.getPhysicalMap();
+            ipage.getRecords().forEach(getEvaluatorPageDTO -> {
+                getEvaluatorPageDTO.setSexName(SexEnum.getName(getEvaluatorPageDTO.getSex()));
+                getEvaluatorPageDTO.setAge(DateUtil.yearCompare(getEvaluatorPageDTO.getBirthday(), DateUtil.now()));
+
+                String[] physicalTypes = getEvaluatorPageDTO.getPhysicalTypes().split(",");
                 List<PhysicalInfoDTO> physicalInfoDTOList = ListUtil.newArrayList();
                 for (String physicalType : physicalTypes) {
-                    if(physicalInfoMap.get(physicalType)!=null) {
-                    	PhysicalInfoDTO physicalInfoDTO = new PhysicalInfoDTO();
+                    if (physicalInfoMap.get(physicalType) != null) {
+                        PhysicalInfoDTO physicalInfoDTO = new PhysicalInfoDTO();
                         BeanUtil.copyProperties(physicalInfoMap.get(physicalType), physicalInfoDTO);
                         physicalInfoDTOList.add(physicalInfoDTO);
                     }
                 }
                 getEvaluatorPageDTO.setPhysicalInfoDTOList(physicalInfoDTOList);
-    		});
-    	}
-    	return ipage;
+            });
+        }
+        return ipage;
     }
-    
+
     /**
      * 进行体质计算
+     *
      * @param evaluatorCalVO
      * @return
      */
-    private EvaluatorCalDTO evaluatorCalPrav(EvaluatorCalVO evaluatorCalVO){
-    	List<PhysicalVal> physicalValList = valueSort(evaluatorCalVO);
+    private EvaluatorCalDTO evaluatorCalPrav(EvaluatorCalVO evaluatorCalVO) {
+        List<PhysicalVal> physicalValList = valueSort(evaluatorCalVO);
         Double max = physicalValList.get(0).getValue();
         Double min = physicalValList.get(4).getValue();
-        
-        String physicalRes = null,physicalTypes=null;
-        if(max>=50){
+
+        String physicalRes = null, physicalTypes = null;
+        if (max >= 50) {
             // 最大值有多个【是XX体质兼有XX体质】,最大值只有1个【是XX体质】
-            if(physicalValList.get(1).getValue()>=50){
-            	physicalRes = "是" 
-            				+ PhysicalTypeEnum.getName(physicalValList.get(0).getEnumNo())
-            				+ "兼有" 
-            				+ PhysicalTypeEnum.getName(physicalValList.get(1).getEnumNo());
-            	physicalTypes = physicalValList.get(0).getEnumNo() 
-            				  + "," 
-            				  + physicalValList.get(1).getEnumNo();
-            }else{
-            	physicalRes = "是" + PhysicalTypeEnum.getName(physicalValList.get(0).getEnumNo());
-            	physicalTypes = String.valueOf(physicalValList.get(0).getEnumNo());
+            if (physicalValList.get(1).getValue() >= 50) {
+                physicalRes = "是"
+                        + PhysicalTypeEnum.getName(physicalValList.get(0).getEnumNo())
+                        + "兼有"
+                        + PhysicalTypeEnum.getName(physicalValList.get(1).getEnumNo());
+                physicalTypes = physicalValList.get(0).getEnumNo()
+                        + ","
+                        + physicalValList.get(1).getEnumNo();
+            } else {
+                physicalRes = "是" + PhysicalTypeEnum.getName(physicalValList.get(0).getEnumNo());
+                physicalTypes = String.valueOf(physicalValList.get(0).getEnumNo());
             }
-        }else if(max<30){
+        } else if (max < 30) {
             // 同时其他5种体质转化分均<30分, max[2/3/4/5/6] < 30
-        	physicalRes = "平和体质";
-        	physicalTypes = String.valueOf(PhysicalTypeEnum.mild.getKey());
-        }else{
-            if(evaluatorCalVO.getMildValue().doubleValue()>=60.0){
-                if(max<50&&min>=30){
+            physicalRes = "平和体质";
+            physicalTypes = String.valueOf(PhysicalTypeEnum.mild.getKey());
+        } else {
+            if (evaluatorCalVO.getMildValue().doubleValue() >= 60.0) {
+                if (max < 50 && min >= 30) {
                     // 同时其他5种体质转化分均<50分,min[2/3/4/5/6] >= 30 and max[2/3/4/5/6] < 50
-                	physicalRes = "基本是平和体质";
-                	physicalTypes = String.valueOf(PhysicalTypeEnum.mild.getKey());
-                }else if(max<50&&max>=30&&min<30){
+                    physicalRes = "基本是平和体质";
+                    physicalTypes = String.valueOf(PhysicalTypeEnum.mild.getKey());
+                } else if (max < 50 && max >= 30 && min < 30) {
                     // 同时其他5种体质转化分有30-49分,max[2/3/4/5/6] < 50 and max[2/3/4/5/6] >= 30 and min[2/3/4/5/6] < 30
-                	physicalRes = "基本是平和体质兼倾向" + PhysicalTypeEnum.getName(physicalValList.get(0).getEnumNo());
-                	physicalTypes = PhysicalTypeEnum.mild.getKey() + "," + physicalValList.get(0).getEnumNo();
+                    physicalRes = "基本是平和体质兼倾向" + PhysicalTypeEnum.getName(physicalValList.get(0).getEnumNo());
+                    physicalTypes = PhysicalTypeEnum.mild.getKey() + "," + physicalValList.get(0).getEnumNo();
                 }
-            }else{
-                if(physicalValList.get(0).getValue().equals(physicalValList.get(1).getValue())){
-                	physicalRes = "倾向是" 
-                                + PhysicalTypeEnum.getName(physicalValList.get(0).getEnumNo())
-                                + "兼有" 
-                                + PhysicalTypeEnum.getName(physicalValList.get(1).getEnumNo());
-                	physicalTypes = physicalValList.get(0).getEnumNo() + "," + physicalValList.get(1).getEnumNo();
-                }else{
-                	physicalRes = "倾向是" + PhysicalTypeEnum.getName(physicalValList.get(0).getEnumNo());
-                	physicalTypes = String.valueOf(physicalValList.get(0).getEnumNo());
+            } else {
+                if (physicalValList.get(0).getValue().equals(physicalValList.get(1).getValue())) {
+                    physicalRes = "倾向是"
+                            + PhysicalTypeEnum.getName(physicalValList.get(0).getEnumNo())
+                            + "兼有"
+                            + PhysicalTypeEnum.getName(physicalValList.get(1).getEnumNo());
+                    physicalTypes = physicalValList.get(0).getEnumNo() + "," + physicalValList.get(1).getEnumNo();
+                } else {
+                    physicalRes = "倾向是" + PhysicalTypeEnum.getName(physicalValList.get(0).getEnumNo());
+                    physicalTypes = String.valueOf(physicalValList.get(0).getEnumNo());
                 }
             }
         }
-    	
-    	EvaluatorCalDTO evaluatorCalDTO = new EvaluatorCalDTO();
-    	BeanUtil.copyProperties(evaluatorCalVO, evaluatorCalDTO);
-    	evaluatorCalDTO.setPhysicalRes(physicalRes);
+
+        EvaluatorCalDTO evaluatorCalDTO = new EvaluatorCalDTO();
+        BeanUtil.copyProperties(evaluatorCalVO, evaluatorCalDTO);
+        evaluatorCalDTO.setPhysicalRes(physicalRes);
         evaluatorCalDTO.setPhysicalTypes(physicalTypes);
-    	
-    	return evaluatorCalDTO;
+
+        return evaluatorCalDTO;
     }
-    
+
     /**
      * 对偏颇体质排序
+     *
      * @param evaluatorCalVO
      * @return
      */
-    private List<PhysicalVal> valueSort(EvaluatorCalVO evaluatorCalVO){
+    private List<PhysicalVal> valueSort(EvaluatorCalVO evaluatorCalVO) {
         List<PhysicalVal> res = ListUtil.newArrayList();
         //气虚体质转化分
         PhysicalVal faintValue = new PhysicalVal();
@@ -228,9 +232,9 @@ public class InquiryEvaluatorFacade extends InquiryEvaluatorServiceImpl {
 
         return res.stream()
                 .sorted(Comparator.comparing(PhysicalVal::getValue)
-                .reversed()
-                .thenComparing(PhysicalVal::getOrderNo))
+                        .reversed()
+                        .thenComparing(PhysicalVal::getOrderNo))
                 .collect(Collectors.toList());
     }
-    
+
 }

prec-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -1,12 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.GetInquiryDetailImgDTO;
@@ -30,6 +23,12 @@ import com.diagbot.util.StringUtil;
 import com.diagbot.vo.GetInquiryDetailVO;
 import com.diagbot.vo.HisInquirysVO;
 import com.diagbot.vo.SaveInquiryVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * @author: zhoutg
@@ -37,29 +36,30 @@ import com.diagbot.vo.SaveInquiryVO;
  */
 @Component
 public class InquiryInfoFacade extends InquiryInfoServiceImpl {
-	
-	@Autowired
+
+    @Autowired
     private InquiryDetailFacade inquiryDetailFacade;
-	@Autowired
+    @Autowired
     private InquiryReportFacade inquiryReportFacade;
-	@Autowired
+    @Autowired
     private InquiryEvaluatorFacade inquiryEvaluatorFacade;
-	@Autowired
+    @Autowired
     @Qualifier("inquiryDetailServiceImpl")
     private InquiryDetailServiceImpl inquiryDetailServiceImpl;
-	@Autowired
+    @Autowired
     @Qualifier("inquiryReportServiceImpl")
     private InquiryReportServiceImpl inquiryReportServiceImpl;
 
     /**
      * 问诊记录保存
+     *
      * @param saveInquiryVO
      * @return
      */
-	public SaveInquiryDTO saveInquiry(SaveInquiryVO saveInquiryVO){
-		SaveInquiryDTO saveInquiryDTO = new SaveInquiryDTO();
+    public SaveInquiryDTO saveInquiry(SaveInquiryVO saveInquiryVO) {
+        SaveInquiryDTO saveInquiryDTO = new SaveInquiryDTO();
         Date now = DateUtil.now();
-        
+
         QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<>();
         inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
         inquiryInfoQe.eq("hospital_id", saveInquiryVO.getHospitalId());
@@ -68,156 +68,158 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         inquiryInfoQe.eq("patient_id", saveInquiryVO.getPatientId());
         inquiryInfoQe.eq("inquiry_code", saveInquiryVO.getInquiryCode());
         InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe);
-        
-        if(inquiryInfo==null){
-        	inquiryInfo = new InquiryInfo();
-        	inquiryInfo.setGmtCreate(now);
-        }else{
-        	QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
-        	inquiryDetailQe.eq("inquiry_id", inquiryInfo.getId());
-        	inquiryDetailFacade.remove(inquiryDetailQe);
-        	
-        	QueryWrapper<InquiryReport> inquiryReportQe = new QueryWrapper<>();
-        	inquiryReportQe.eq("inquiry_id", inquiryInfo.getId());
-        	inquiryReportFacade.remove(inquiryReportQe);
+
+        if (inquiryInfo == null) {
+            inquiryInfo = new InquiryInfo();
+            inquiryInfo.setGmtCreate(now);
+        } else {
+            QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
+            inquiryDetailQe.eq("inquiry_id", inquiryInfo.getId());
+            inquiryDetailFacade.remove(inquiryDetailQe);
+
+            QueryWrapper<InquiryReport> inquiryReportQe = new QueryWrapper<>();
+            inquiryReportQe.eq("inquiry_id", inquiryInfo.getId());
+            inquiryReportFacade.remove(inquiryReportQe);
         }
-        
+
         BeanUtil.copyProperties(saveInquiryVO, inquiryInfo);
         inquiryInfo.setGmtModified(now);
         saveOrUpdate(inquiryInfo);
-        
+
         Long inquiryId = inquiryInfo.getId();
-        
+
         List<InquiryDetail> inquiryDetailList = BeanUtil.listCopyTo(saveInquiryVO.getDetailList(), InquiryDetail.class);
-        inquiryDetailList.forEach(i->{
-        	i.setInquiryId(inquiryId);
+        inquiryDetailList.forEach(i -> {
+            i.setInquiryId(inquiryId);
             i.setGmtCreate(now);
             i.setGmtModified(now);
         });
         inquiryDetailServiceImpl.saveBatch(inquiryDetailList);
-        
+
         List<InquiryReport> inquiryReportList = BeanUtil.listCopyTo(saveInquiryVO.getReportList(), InquiryReport.class);
-        inquiryReportList.forEach(i->{
-        	i.setInquiryId(inquiryId);
+        inquiryReportList.forEach(i -> {
+            i.setInquiryId(inquiryId);
             i.setGmtCreate(now);
             i.setGmtModified(now);
         });
         inquiryReportServiceImpl.saveBatch(inquiryReportList);
-		
+
         saveInquiryDTO.setInquiryId(inquiryId);
-        
-		return saveInquiryDTO;
-	}
-	
-	/**
+
+        return saveInquiryDTO;
+    }
+
+    /**
      * 历史病历列表
+     *
      * @param hisInquirysVO
      * @return
      */
     public List<HisInquiryDTO> hisInquirys(HisInquirysVO hisInquirysVO) {
-    	if(hisInquirysVO.getHospitalId()==null&&StringUtil.isBlank(hisInquirysVO.getHospitalCode())){
-    		throw new CommonException(CommonErrorCode.PARAM_IS_NULL,"医院信息(医院id或者医院编码)必传！");
-    	}
-    	
+        if (hisInquirysVO.getHospitalId() == null && StringUtil.isBlank(hisInquirysVO.getHospitalCode())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "医院信息(医院id或者医院编码)必传！");
+        }
+
         QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<InquiryInfo>();
         inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
-        inquiryInfoQe.eq(hisInquirysVO.getHospitalId()!=null, "hospital_id", hisInquirysVO.getHospitalId());
+        inquiryInfoQe.eq(hisInquirysVO.getHospitalId() != null, "hospital_id", hisInquirysVO.getHospitalId());
         inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getHospitalCode()), "hospital_code", hisInquirysVO.getHospitalCode());
-        inquiryInfoQe.eq(hisInquirysVO.getHospitalDeptId()!=null, "hospital_dept_id", hisInquirysVO.getHospitalDeptId());
+        inquiryInfoQe.eq(hisInquirysVO.getHospitalDeptId() != null, "hospital_dept_id", hisInquirysVO.getHospitalDeptId());
         inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getHospitalDeptCode()), "hospital_dept_code", hisInquirysVO.getHospitalDeptCode());
-        inquiryInfoQe.eq(hisInquirysVO.getDoctorId()!=null, "doctor_id", hisInquirysVO.getDoctorId());
+        inquiryInfoQe.eq(hisInquirysVO.getDoctorId() != null, "doctor_id", hisInquirysVO.getDoctorId());
         inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getDoctorCode()), "doctor_code", hisInquirysVO.getDoctorCode());
-        inquiryInfoQe.eq(hisInquirysVO.getPatientId()!=null, "patient_id", hisInquirysVO.getPatientId());
+        inquiryInfoQe.eq(hisInquirysVO.getPatientId() != null, "patient_id", hisInquirysVO.getPatientId());
         inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getPatientCode()), "patient_code", hisInquirysVO.getPatientCode());
         inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getPatientIdNo()), "patient_id_no", hisInquirysVO.getPatientIdNo());
-        inquiryInfoQe.eq(hisInquirysVO.getType()!=null, "type", hisInquirysVO.getType());
-        
-        inquiryInfoQe.ge(hisInquirysVO.getStartDate()!=null, "gmt_create", hisInquirysVO.getStartDate());
-        inquiryInfoQe.le(hisInquirysVO.getEndDate()!=null, "gmt_create", hisInquirysVO.getEndDate());
-        
-        if(hisInquirysVO.getOrderType()==null||hisInquirysVO.getOrderType()==1) {
-        	inquiryInfoQe.orderByDesc("gmt_modified");
-        }else if(hisInquirysVO.getOrderType()==2){
-        	inquiryInfoQe.orderByAsc("gmt_modified");
-        }else if(hisInquirysVO.getOrderType()==3){
-        	inquiryInfoQe.orderByDesc("inquiry_code");
-        }else if(hisInquirysVO.getOrderType()==4){
-        	inquiryInfoQe.orderByAsc("inquiry_code");
+        inquiryInfoQe.eq(hisInquirysVO.getType() != null, "type", hisInquirysVO.getType());
+
+        inquiryInfoQe.ge(hisInquirysVO.getStartDate() != null, "gmt_create", hisInquirysVO.getStartDate());
+        inquiryInfoQe.le(hisInquirysVO.getEndDate() != null, "gmt_create", hisInquirysVO.getEndDate());
+
+        if (hisInquirysVO.getOrderType() == null || hisInquirysVO.getOrderType() == 1) {
+            inquiryInfoQe.orderByDesc("gmt_modified");
+        } else if (hisInquirysVO.getOrderType() == 2) {
+            inquiryInfoQe.orderByAsc("gmt_modified");
+        } else if (hisInquirysVO.getOrderType() == 3) {
+            inquiryInfoQe.orderByDesc("inquiry_code");
+        } else if (hisInquirysVO.getOrderType() == 4) {
+            inquiryInfoQe.orderByAsc("inquiry_code");
         }
 
         List<HisInquiryDTO> hisInquiryDTOList = BeanUtil.listCopyTo(list(inquiryInfoQe), HisInquiryDTO.class);
-        hisInquiryDTOList.forEach(i->{
-        	i.setPatientSexMsg(SexEnum.getName(i.getPatientSex()));
-        	i.setInquiryDate(i.getGmtModified());
-        	i.setInquiryTime(i.getGmtModified());
-        	i.setPatientAge(DateUtil.yearCompare(i.getPatientBirthday(), DateUtil.now()));
+        hisInquiryDTOList.forEach(i -> {
+            i.setPatientSexMsg(SexEnum.getName(i.getPatientSex()));
+            i.setInquiryDate(i.getGmtModified());
+            i.setInquiryTime(i.getGmtModified());
+            i.setPatientAge(DateUtil.yearCompare(i.getPatientBirthday(), DateUtil.now()));
         });
 
         return hisInquiryDTOList;
     }
-	
+
     /**
      * 病历详情
+     *
      * @param getInquiryDetailVO
      * @return
      */
     public GetInquiryDetailDTO getInquiryDetail(GetInquiryDetailVO getInquiryDetailVO) {
-    	if(getInquiryDetailVO.getHospitalId()==null&&StringUtil.isBlank(getInquiryDetailVO.getHospitalCode())){
-    		throw new CommonException(CommonErrorCode.PARAM_IS_NULL,"医院信息(医院id或者医院编码)必传！");
-    	}
-    	if(getInquiryDetailVO.getHospitalDeptId()==null&&StringUtil.isBlank(getInquiryDetailVO.getHospitalDeptCode())){
-    		throw new CommonException(CommonErrorCode.PARAM_IS_NULL,"科室信息(科室id或者科室编码)必传！");
-    	}
-    	if(getInquiryDetailVO.getDoctorId()==null&&StringUtil.isBlank(getInquiryDetailVO.getDoctorCode())){
-    		throw new CommonException(CommonErrorCode.PARAM_IS_NULL,"医生信息(医生id或者医生编码)必传！");
-    	}
-    	if(getInquiryDetailVO.getPatientId()==null&&StringUtil.isBlank(getInquiryDetailVO.getPatientCode())&&StringUtil.isBlank(getInquiryDetailVO.getPatientIdNo())){
-    		throw new CommonException(CommonErrorCode.PARAM_IS_NULL,"患者信息(患者id或者患者编码或者患者病历号)必传！");
-    	}
-    	
-    	QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<InquiryInfo>();
+        if (getInquiryDetailVO.getHospitalId() == null && StringUtil.isBlank(getInquiryDetailVO.getHospitalCode())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "医院信息(医院id或者医院编码)必传！");
+        }
+        if (getInquiryDetailVO.getHospitalDeptId() == null && StringUtil.isBlank(getInquiryDetailVO.getHospitalDeptCode())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "科室信息(科室id或者科室编码)必传！");
+        }
+        if (getInquiryDetailVO.getDoctorId() == null && StringUtil.isBlank(getInquiryDetailVO.getDoctorCode())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "医生信息(医生id或者医生编码)必传！");
+        }
+        if (getInquiryDetailVO.getPatientId() == null && StringUtil.isBlank(getInquiryDetailVO.getPatientCode()) && StringUtil.isBlank(getInquiryDetailVO.getPatientIdNo())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "患者信息(患者id或者患者编码或者患者病历号)必传！");
+        }
+
+        QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<InquiryInfo>();
         inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
-        inquiryInfoQe.eq(getInquiryDetailVO.getHospitalId()!=null, "hospital_id", getInquiryDetailVO.getHospitalId());
+        inquiryInfoQe.eq(getInquiryDetailVO.getHospitalId() != null, "hospital_id", getInquiryDetailVO.getHospitalId());
         inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getHospitalCode()), "hospital_code", getInquiryDetailVO.getHospitalCode());
-        inquiryInfoQe.eq(getInquiryDetailVO.getHospitalDeptId()!=null, "hospital_dept_id", getInquiryDetailVO.getHospitalDeptId());
+        inquiryInfoQe.eq(getInquiryDetailVO.getHospitalDeptId() != null, "hospital_dept_id", getInquiryDetailVO.getHospitalDeptId());
         inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getHospitalDeptCode()), "hospital_dept_code", getInquiryDetailVO.getHospitalDeptCode());
-        inquiryInfoQe.eq(getInquiryDetailVO.getDoctorId()!=null, "doctor_id", getInquiryDetailVO.getDoctorId());
+        inquiryInfoQe.eq(getInquiryDetailVO.getDoctorId() != null, "doctor_id", getInquiryDetailVO.getDoctorId());
         inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getDoctorCode()), "doctor_code", getInquiryDetailVO.getDoctorCode());
-        inquiryInfoQe.eq(getInquiryDetailVO.getPatientId()!=null, "patient_id", getInquiryDetailVO.getPatientId());
+        inquiryInfoQe.eq(getInquiryDetailVO.getPatientId() != null, "patient_id", getInquiryDetailVO.getPatientId());
         inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getPatientCode()), "patient_code", getInquiryDetailVO.getPatientCode());
         inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getPatientIdNo()), "patient_id_no", getInquiryDetailVO.getPatientIdNo());
         inquiryInfoQe.eq("inquiry_code", getInquiryDetailVO.getInquiryCode());
-        
+
         InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe);
-        
+
         QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
-    	inquiryDetailQe.eq("inquiry_id", inquiryInfo.getId());
-    	inquiryDetailQe.orderByAsc("type");
-    	List<InquiryDetail> inquiryDetailList = inquiryDetailFacade.list(inquiryDetailQe);
-    	
-    	QueryWrapper<InquiryReport> inquiryReportQe = new QueryWrapper<>();
-    	inquiryReportQe.eq("inquiry_id", inquiryInfo.getId());
-    	inquiryReportQe.orderByAsc("order_num");
-    	List<InquiryReport> inquiryReportList = inquiryReportFacade.list(inquiryReportQe);
-    	
-    	QueryWrapper<InquiryEvaluator> inquiryEvaluatorQe = new QueryWrapper<>();
-    	inquiryEvaluatorQe.eq("inquiry_id", inquiryInfo.getId());
-    	inquiryEvaluatorQe.orderByDesc("gmt_modified");
-    	inquiryEvaluatorQe.last("limit 0,1");
-    	List<InquiryEvaluator> inquiryEvaluatorList = inquiryEvaluatorFacade.list(inquiryEvaluatorQe);
-    	
+        inquiryDetailQe.eq("inquiry_id", inquiryInfo.getId());
+        inquiryDetailQe.orderByAsc("type");
+        List<InquiryDetail> inquiryDetailList = inquiryDetailFacade.list(inquiryDetailQe);
+
+        QueryWrapper<InquiryReport> inquiryReportQe = new QueryWrapper<>();
+        inquiryReportQe.eq("inquiry_id", inquiryInfo.getId());
+        inquiryReportQe.orderByAsc("order_num");
+        List<InquiryReport> inquiryReportList = inquiryReportFacade.list(inquiryReportQe);
+
+        QueryWrapper<InquiryEvaluator> inquiryEvaluatorQe = new QueryWrapper<>();
+        inquiryEvaluatorQe.eq("inquiry_id", inquiryInfo.getId());
+        inquiryEvaluatorQe.orderByDesc("gmt_modified");
+        inquiryEvaluatorQe.last("limit 0,1");
+        List<InquiryEvaluator> inquiryEvaluatorList = inquiryEvaluatorFacade.list(inquiryEvaluatorQe);
+
         GetInquiryDetailDTO getInquiryDetailDTO = new GetInquiryDetailDTO();
         BeanUtil.copyProperties(inquiryInfo, getInquiryDetailDTO);
         getInquiryDetailDTO.setPatientSexMsg(SexEnum.getName(inquiryInfo.getPatientSex()));
         getInquiryDetailDTO.setInquiryDate(inquiryInfo.getGmtModified());
         getInquiryDetailDTO.setInquiryTime(inquiryInfo.getGmtModified());
         getInquiryDetailDTO.setPatientAge(DateUtil.yearCompare(inquiryInfo.getPatientBirthday(), DateUtil.now()));
-        
+
         getInquiryDetailDTO.setChiefComplaint(inquiryDetailList.get(0).getContentValue());
         getInquiryDetailDTO.setXbs(inquiryDetailList.get(1).getContentValue());
         getInquiryDetailDTO.setQts(inquiryDetailList.get(2).getContentValue());
         getInquiryDetailDTO.setSupplement(inquiryDetailList.get(3).getContentValue());
-        getInquiryDetailDTO.setPhysicalRes(ListUtil.isNotEmpty(inquiryEvaluatorList)?inquiryEvaluatorList.get(0).getPhysicalRes():null);
+        getInquiryDetailDTO.setPhysicalRes(ListUtil.isNotEmpty(inquiryEvaluatorList) ? inquiryEvaluatorList.get(0).getPhysicalRes() : null);
         getInquiryDetailDTO.setImageList(BeanUtil.listCopyTo(inquiryReportList, GetInquiryDetailImgDTO.class));
 
         return getInquiryDetailDTO;

prec-service/src/main/java/com/diagbot/facade/InquiryReportFacade.java

@@ -1,8 +1,7 @@
 package com.diagbot.facade;
 
-import org.springframework.stereotype.Component;
-
 import com.diagbot.service.impl.InquiryReportServiceImpl;
+import org.springframework.stereotype.Component;
 
 /**
  * @author: zhoutg
@@ -11,6 +10,4 @@ import com.diagbot.service.impl.InquiryReportServiceImpl;
 @Component
 public class InquiryReportFacade extends InquiryReportServiceImpl {
 
-    
-
 }

prec-service/src/main/java/com/diagbot/facade/ModuleFacade.java

@@ -106,7 +106,7 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
                     }
                     if (null != detailDTO.getRelationModule() &&
                             moduleInfoMap.get(detailDTO.getRelationModule()) != null) {
-                            detailDTO.setRelationModuleName(moduleInfoMap.get(detailDTO.getRelationModule()).getName());
+                        detailDTO.setRelationModuleName(moduleInfoMap.get(detailDTO.getRelationModule()).getName());
                     }
                 }
                 bean.setModuleDetailDTOList(moduleDetailDTOList);

prec-service/src/main/java/com/diagbot/facade/PatientInfoFacade.java

@@ -1,14 +1,13 @@
 package com.diagbot.facade;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.GetTopPatientInfoVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @Description: 患者业务逻辑

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

@@ -155,9 +155,9 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
             // 设置第二层mapping
             List<QuestionInfoWrapper> w2 = mapping2.get(res.getId());
             if (ListUtil.isNotEmpty(w2)) {
-                List<QuestionDTO> m2 =  BeanUtil.listCopyTo(w2, QuestionDTO.class);
+                List<QuestionDTO> m2 = BeanUtil.listCopyTo(w2, QuestionDTO.class);
                 res.setQuestionMapping(m2);
-                for (QuestionDTO q2: m2) {
+                for (QuestionDTO q2 : m2) {
                     // 设置第二层明细
                     if (detailMap2.get(q2.getId()) != null) {
                         q2.setQuestionDetailList(detailMap2.get(q2.getId()));
@@ -165,9 +165,9 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                     List<QuestionInfoWrapper> w3 = mapping3.get(q2.getId());
                     if (ListUtil.isNotEmpty(w3)) {
                         // 设置第三层mapping
-                        List<QuestionDTO> m3 =  BeanUtil.listCopyTo(w3, QuestionDTO.class);
+                        List<QuestionDTO> m3 = BeanUtil.listCopyTo(w3, QuestionDTO.class);
                         q2.setQuestionMapping(m3);
-                        for (QuestionDTO q3: m3) {
+                        for (QuestionDTO q3 : m3) {
                             // 设置第三层明细
                             if (detailMap3.get(q3.getId()) != null) {
                                 q3.setQuestionDetailList(detailMap3.get(q3.getId()));
@@ -202,8 +202,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
      * 获取下级question
      *
      * @param sexType 性别
-     * @param age 年龄
-     * @param ids 列表
+     * @param age     年龄
+     * @param ids     列表
      * @return
      */
     public Map getQuestionMappingWithMap(Integer sexType, Integer age, List<Long> ids, List<Long> mappIds) {

prec-service/src/main/java/com/diagbot/facade/QuestionUsualFacade.java

@@ -43,45 +43,45 @@ public class QuestionUsualFacade {
      */
     public List<QuestionUsualDTO> getQuestionUsual(QuestionUsualVO questionUsualVO) {
         ConceptUsualVO conceptUsualVO = new ConceptUsualVO();
-        BeanUtil.copyProperties(questionUsualVO,conceptUsualVO);
+        BeanUtil.copyProperties(questionUsualVO, conceptUsualVO);
         Integer type = QuestionTypeEnum.Symptom.getKey();
         conceptUsualVO.setType(type);
         List<QuestionUsualDTO> questionUsualDTOList = new ArrayList<>();
         //从知识库获取常用标签
         RespDTO<List<ConceptBaseDTO>> conceptBaseDTORespDTO = aiptServiceClient.getConceptUsual(conceptUsualVO);
         //如果该科室没有常用，返回全科常用
-        if( conceptBaseDTORespDTO != null && ListUtil.isEmpty(conceptBaseDTORespDTO.data)){
+        if (conceptBaseDTORespDTO != null && ListUtil.isEmpty(conceptBaseDTORespDTO.data)) {
             conceptUsualVO.setDeptName("全科");
             conceptBaseDTORespDTO = aiptServiceClient.getConceptUsual(conceptUsualVO);
         }
-        RespDTOUtil.respNGDeal(conceptBaseDTORespDTO,"获取常用标签失败");
-        if( conceptBaseDTORespDTO.data != null
-                && ListUtil.isNotEmpty(conceptBaseDTORespDTO.data)){
+        RespDTOUtil.respNGDeal(conceptBaseDTORespDTO, "获取常用标签失败");
+        if (conceptBaseDTORespDTO.data != null
+                && ListUtil.isNotEmpty(conceptBaseDTORespDTO.data)) {
             //提取标签名称
             List<String> conceptName = conceptBaseDTORespDTO.data.stream()
                     .map(ConceptBaseDTO::getName)
                     .collect(Collectors.toList());
             //与question标签匹配
             QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-            questionInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
-                    .in("tag_name",conceptName)
-                    .ne("tag_type",8)
-                    .eq("item_type",0)
-                    .eq("type",type);
+            questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("tag_name", conceptName)
+                    .ne("tag_type", 8)
+                    .eq("item_type", 0)
+                    .eq("type", type);
             List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
-            Map<String,QuestionInfo> questionInfoMap
+            Map<String, QuestionInfo> questionInfoMap
                     = questionInfoList.stream()
-                    .collect(Collectors.toMap(QuestionInfo::getTagName,questionInfo -> questionInfo));
-            questionUsualDTOList = BeanUtil.listCopyTo(conceptBaseDTORespDTO.data,QuestionUsualDTO.class);
-            for (QuestionUsualDTO questionUsualDTO: questionUsualDTOList) {
-                if(null != questionInfoMap.get(questionUsualDTO.getName())){
+                    .collect(Collectors.toMap(QuestionInfo::getTagName, questionInfo -> questionInfo));
+            questionUsualDTOList = BeanUtil.listCopyTo(conceptBaseDTORespDTO.data, QuestionUsualDTO.class);
+            for (QuestionUsualDTO questionUsualDTO : questionUsualDTOList) {
+                if (null != questionInfoMap.get(questionUsualDTO.getName())) {
                     questionUsualDTO.setQuestionId(questionInfoMap.get(questionUsualDTO.getName()).getId());
                 }
             }
             //如何没有匹配到questionId就移除
             Iterator<QuestionUsualDTO> questionUsualDTOIterator = questionUsualDTOList.iterator();
-            while (questionUsualDTOIterator.hasNext()){
-                if(questionUsualDTOIterator.next().getQuestionId() == null){
+            while (questionUsualDTOIterator.hasNext()) {
+                if (questionUsualDTOIterator.next().getQuestionId() == null) {
                     questionUsualDTOIterator.remove();
                 }
             }

prec-service/src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -74,14 +74,14 @@ public class RetrievalFacade {
                 retrievalDTO.setConceptId(conceptRetrievalDTO.getSelfId());
                 retrievalDTO.setName(conceptRetrievalDTO.getSelfName());
                 if (StringUtil.isNotEmpty(conceptRetrievalDTO.getParentName())) {//parent不为空时说明有子项，返回父级id
-                    if(null != questionInfoMap.get(conceptRetrievalDTO.getParentName())){//如果匹配到就添加questionId
+                    if (null != questionInfoMap.get(conceptRetrievalDTO.getParentName())) {//如果匹配到就添加questionId
                         retrievalDTO.setQuestionId(questionInfoMap.get(conceptRetrievalDTO.getParentName()).getId());
                     }
                     retrievalDTO.setConceptId(conceptRetrievalDTO.getParentId());
                     retrievalDTO.setName(conceptRetrievalDTO.getParentName());
                     retrievalDTO.setRetrievalName(conceptRetrievalDTO.getSelfName());
                 } else {//parent为空时说明没有子项返回本体id
-                    if(null != questionInfoMap.get(conceptRetrievalDTO.getSelfName())){//如果匹配到就添加questionId
+                    if (null != questionInfoMap.get(conceptRetrievalDTO.getSelfName())) {//如果匹配到就添加questionId
                         retrievalDTO.setQuestionId(questionInfoMap.get(conceptRetrievalDTO.getSelfName()).getId());
                     }
                 }
@@ -97,14 +97,14 @@ public class RetrievalFacade {
         }
         //如何没有匹配到questionId就移除
         Iterator<RetrievalDTO> retrievalDTOIterator = retrievalDTOS.iterator();
-        while (retrievalDTOIterator.hasNext()){
+        while (retrievalDTOIterator.hasNext()) {
             RetrievalDTO retrievalDTO = new RetrievalDTO();
             retrievalDTO = retrievalDTOIterator.next();
-                if(retrievalDTO.getQuestionId() == null
-                        && retrievalDTO.getType().intValue() != QuestionTypeEnum.Pacs.getKey()
-                        && retrievalDTO.getType().intValue() != QuestionTypeEnum.Disease.getKey()){
-                        retrievalDTOIterator.remove();
-                }
+            if (retrievalDTO.getQuestionId() == null
+                    && retrievalDTO.getType().intValue() != QuestionTypeEnum.Pacs.getKey()
+                    && retrievalDTO.getType().intValue() != QuestionTypeEnum.Disease.getKey()) {
+                retrievalDTOIterator.remove();
+            }
         }
         return retrievalDTOS;
     }

prec-service/src/main/java/com/diagbot/facade/SysSetFacade.java

@@ -1,18 +1,16 @@
 package com.diagbot.facade;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SysSetInfoDTO;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.HospitalSetVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2019年6月18日 上午10:24:58
@@ -20,18 +18,18 @@ import com.diagbot.vo.HospitalSetVO;
 @Component
 public class SysSetFacade {
 
-	@Autowired
-	TranServiceClient tranServiceClient;
+    @Autowired
+    TranServiceClient tranServiceClient;
 
-	/**
-	 * 根据医院code获取配置信息
-	 * 
-	 * @return
-	 */
-	public List<SysSetInfoDTO> getSysSetInfoData(HospitalSetVO hospitalSetVO) {
-		RespDTO<List<SysSetInfoDTO>> sysSetInfoLists = tranServiceClient.getSysSetInfoDatas(hospitalSetVO);
-		RespDTOUtil.respNGDeal(sysSetInfoLists, "获取配置数据失败！");
-		return sysSetInfoLists.data;
-	}
+    /**
+     * 根据医院code获取配置信息
+     *
+     * @return
+     */
+    public List<SysSetInfoDTO> getSysSetInfoData(HospitalSetVO hospitalSetVO) {
+        RespDTO<List<SysSetInfoDTO>> sysSetInfoLists = tranServiceClient.getSysSetInfoDatas(hospitalSetVO);
+        RespDTOUtil.respNGDeal(sysSetInfoLists, "获取配置数据失败！");
+        return sysSetInfoLists.data;
+    }
 
 }

prec-service/src/main/java/com/diagbot/web/EnumsController.java

@@ -19,13 +19,13 @@ import java.util.Map;
  * @time: 2018/9/19 14:32
  */
 @RestController
-@Api(value = "智能预问诊枚举数据获取API", tags = { "智能预问诊枚举数据获取API" })
+@Api(value = "智能预问诊枚举数据获取API", tags = { "智能预问诊-智能预问诊枚举数据获取API" })
 @SuppressWarnings("unchecked")
 public class EnumsController {
     @Autowired
     private EnumsDataFacade enumsDataFacade;
 
-    @ApiOperation(value = "智能预问诊枚举数据获取[by:gaodm]",
+    @ApiOperation(value = "智能预问诊-智能预问诊枚举数据获取[by:gaodm]",
             notes = "智能预问诊枚举数据获取")
     @PostMapping("/getPrecEnumsData")
     @SysLogger("getPrecEnumsData")

prec-service/src/main/java/com/diagbot/web/InquiryEvaluatorController.java

@@ -1,14 +1,5 @@
 package com.diagbot.web;
 
-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.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.EvaluatorCalDTO;
@@ -18,16 +9,23 @@ import com.diagbot.facade.InquiryEvaluatorFacade;
 import com.diagbot.vo.AddEvaluatorVO;
 import com.diagbot.vo.EvaluatorCalVO;
 import com.diagbot.vo.GetEvaluatorPageVO;
-
 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;
 
 @RestController
 @RequestMapping("/inquiryEvaluator")
 @SuppressWarnings("unchecked")
-@Api(value = "问诊-儿童体质辨识API", tags = { "问诊-儿童体质辨识API" })
+@Api(value = "问诊-儿童体质辨识API", tags = { "智能预问诊-儿童体质辨识API" })
 public class InquiryEvaluatorController {
-	
+
     @Autowired
     private InquiryEvaluatorFacade inquiryEvaluatorFacade;
 
@@ -35,7 +33,7 @@ public class InquiryEvaluatorController {
     @PostMapping("/addEvaluator")
     @SysLogger("addEvaluator")
     @Transactional
-    public RespDTO<Boolean> addEvaluator(@Valid @RequestBody AddEvaluatorVO addEvaluatorVO){
+    public RespDTO<Boolean> addEvaluator(@Valid @RequestBody AddEvaluatorVO addEvaluatorVO) {
         return RespDTO.onSuc(inquiryEvaluatorFacade.addEvaluator(addEvaluatorVO));
     }
 
@@ -45,12 +43,12 @@ public class InquiryEvaluatorController {
     public RespDTO<EvaluatorCalDTO> evaluatorCal(@Valid @RequestBody EvaluatorCalVO evaluatorCalVO) {
         return RespDTO.onSuc(inquiryEvaluatorFacade.evaluatorCal(evaluatorCalVO));
     }
-    
+
     @ApiOperation(value = "儿童体质辨识--获取分页信息")
     @PostMapping("/getEvaluatorPage")
     @SysLogger("getEvaluatorPage")
-    public RespDTO<IPage<GetEvaluatorPageDTO>> getEvaluatorPage(@Valid @RequestBody GetEvaluatorPageVO getEvaluatorPageVO){
-    	return RespDTO.onSuc(inquiryEvaluatorFacade.getEvaluatorPage(getEvaluatorPageVO));
+    public RespDTO<IPage<GetEvaluatorPageDTO>> getEvaluatorPage(@Valid @RequestBody GetEvaluatorPageVO getEvaluatorPageVO) {
+        return RespDTO.onSuc(inquiryEvaluatorFacade.getEvaluatorPage(getEvaluatorPageVO));
     }
-    
+
 }

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

@@ -1,16 +1,5 @@
 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.GetInquiryDetailDTO;
 import com.diagbot.dto.HisInquiryDTO;
@@ -20,9 +9,17 @@ import com.diagbot.facade.InquiryInfoFacade;
 import com.diagbot.vo.GetInquiryDetailVO;
 import com.diagbot.vo.HisInquirysVO;
 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 javax.validation.Valid;
+import java.util.List;
 
 /**
  * @author rengb
@@ -30,13 +27,13 @@ import io.swagger.annotations.ApiOperation;
  */
 @RestController
 @RequestMapping("/inquiryInfo")
-@Api(value = "问诊记录API", tags = { "问诊记录API" })
+@Api(value = "问诊记录API", tags = { "智能预问诊-问诊记录API" })
 @SuppressWarnings("unchecked")
 public class InquiryInfoController {
 
     @Autowired
     private InquiryInfoFacade inquiryInfoFacade;
-    
+
     @ApiOperation(value = "问诊记录保存[by:rengb]")
     @PostMapping("/saveInquiry")
     @SysLogger("saveInquiry")
@@ -44,7 +41,7 @@ public class InquiryInfoController {
     public RespDTO<SaveInquiryDTO> saveInquiry(@Valid @RequestBody SaveInquiryVO saveInquiryVO) {
         return RespDTO.onSuc(inquiryInfoFacade.saveInquiry(saveInquiryVO));
     }
-    
+
     @ApiOperation(value = "历史病历列表[by:rengb]")
     @PostMapping("/hisInquirys")
     @SysLogger("hisInquirys")

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

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

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

@@ -1,22 +1,20 @@
 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.GetTopPatientInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PatientInfoFacade;
 import com.diagbot.vo.GetTopPatientInfoVO;
-
 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;
 
 /**
  * <p>
@@ -28,14 +26,14 @@ import io.swagger.annotations.ApiOperation;
  */
 @RestController
 @RequestMapping("/patientInfo")
-@Api(value = "患者信息API", tags = { "患者信息API" })
+@Api(value = "患者信息API", tags = { "智能预问诊-患者信息API" })
 @SuppressWarnings("unchecked")
 public class PatientInfoController {
-	
+
     @Autowired
     private PatientInfoFacade patientInfoFacade;
 
-    @ApiOperation(value = "知识库标准化-页面顶部病人医生科室信息——查询[by:rengb]",
+    @ApiOperation(value = "智能预问诊-页面顶部病人医生科室信息——查询[by:rengb]",
             notes = "hospitalCode：医院编号，必填<br>" +
                     "hospitalDeptCode：医院科室编号，必填<br>" +
                     "doctorCode：医院医生编号，必填<br>" +

prec-service/src/main/java/com/diagbot/web/QuestionInfoController.java

@@ -26,14 +26,14 @@ import java.util.Map;
  */
 @RequestMapping("/questionInfo")
 @RestController
-@Api(value = "标签相关API", tags = { "标签相关API" })
+@Api(value = "标签相关API", tags = { "智能预问诊-标签相关API" })
 @SuppressWarnings("unchecked")
 public class QuestionInfoController {
 
     @Autowired
     QuestionFacade questionFacade;
 
-    @ApiOperation(value = "根据参数返回标签内容[by:zhoutg]",
+    @ApiOperation(value = "智能预问诊-根据参数返回标签内容[by:zhoutg]",
             notes = "id: questionId<br>" +
                     "sexType：性别，1：男，2：女<br>" +
                     "age：年龄")
@@ -44,7 +44,7 @@ public class QuestionInfoController {
     }
 
 
-    @ApiOperation(value = "查询多个id优化[by:zhoutg]",
+    @ApiOperation(value = "智能预问诊-查询多个id优化[by:zhoutg]",
             notes = "ids: 多个questionId<br>" +
                     "sexType：性别，1：男，2：女<br>" +
                     "age：年龄")

prec-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 = "智能预问诊-常用标签——根据科室获取常用标签[by:wangyu]",
             notes = "deptName：科室名称<br>" +
                     "age：年龄<br>" +
                     "sexType: 性别<br>" +

prec-service/src/main/java/com/diagbot/web/RetrievalController.java

@@ -33,7 +33,7 @@ public class RetrievalController {
     @Autowired
     private RetrievalFacade retrievalFacade;
 
-    @ApiOperation(value = "知识库标准化-页面检索——查询[by:wangyu]",
+    @ApiOperation(value = "智能预问诊-页面检索——查询[by:wangyu]",
             notes = "type：不用传<br>" +
                     "age：年龄，必填<br>" +
                     "inputStr：检索内容，必填<br>" +

prec-service/src/main/java/com/diagbot/web/SysSetController.java

@@ -27,20 +27,18 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/sysSet")
-@Api(value = "配置信息API", tags = { "配置信息API" })
+@Api(value = "配置信息API", tags = { "智能预问诊-配置信息API" })
 @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;
 
-		 List<SysSetInfoDTO> data = sysSetFacade.getSysSetInfoData(hospitalSetVO);
-
-		return RespDTO.onSuc(data);
-	}
+    @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);
+        return RespDTO.onSuc(data);
+    }
 }

prec-service/src/main/java/com/diagbot/web/UploadController.java

@@ -22,14 +22,14 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 @RestController
-@Api(value = "文件上传API", tags = { "知识库标准化-文件上传API" })
+@Api(value = "文件上传API", tags = { "智能预问诊-文件上传API" })
 @RequestMapping(value = "/file")
 @SuppressWarnings("unchecked")
 public class UploadController {
     @Autowired
     private UploadFacade uploadFacade;
 
-    @ApiOperation(value = "知识库标准化-单个文件上传")
+    @ApiOperation(value = "智能预问诊-单个文件上传")
     @CrossOrigin(allowCredentials = "true", allowedHeaders = "*", methods = { RequestMethod.POST }, origins = "*")
     @PostMapping(value = "/uploadImage", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public String singleFileUpload(@RequestParam("upfile") MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
@@ -44,7 +44,7 @@ public class UploadController {
         return data;
     }
 
-    @ApiOperation(value = "知识库标准化-多个文件上传")
+    @ApiOperation(value = "智能预问诊-多个文件上传")
     @CrossOrigin(allowCredentials = "true", allowedHeaders = "*", methods = { RequestMethod.POST }, origins = "*")
     @PostMapping(value = "/uploadImages", produces = MediaType.MULTIPART_FORM_DATA_VALUE)
     public String multiFileUpload(@RequestParam("upfiles") MultipartFile[] file, HttpServletRequest request, HttpServletResponse response) {
@@ -59,7 +59,7 @@ public class UploadController {
         return data;
     }
 
-    @ApiOperation(value = "知识库标准化-多个文件上传同时生成缩略图")
+    @ApiOperation(value = "智能预问诊-多个文件上传同时生成缩略图")
     @CrossOrigin(allowCredentials = "true", allowedHeaders = "*", methods = { RequestMethod.POST }, origins = "*")
     @PostMapping(value = "/uploadImageThums", produces = MediaType.MULTIPART_FORM_DATA_VALUE)
     public String multiFileThumUpload(@RequestParam("upfiles") MultipartFile[] file, HttpServletRequest request, HttpServletResponse response) {
@@ -75,7 +75,7 @@ public class UploadController {
     }
 
     @PostMapping("/deleteRemoteFile")
-    @ApiOperation(value = "知识库标准化-文件删除")
+    @ApiOperation(value = "智能预问诊-文件删除")
     public String deleteRemoteFile(@RequestParam("path") String path) {
         String data = FastJsonUtils.getBeanToJson(uploadFacade.deleteRemoteFile(path));
         return data;