Merge remote-tracking branch 'origin/dev/icss' into dev/icss

# Conflicts:
#	icssman-service/src/main/java/com/diagbot/facade/QuestionInfoFacade.java

icss-service/src/main/java/com/diagbot/entity/IntroduceDetail.java

@@ -76,9 +76,9 @@ public class IntroduceDetail implements Serializable {
     private Integer orderNo;
 
     /**
-     * 显示位置：0-都展示，1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示
+     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示
      */
-    private Integer position;
+    private String position;
 
     /**
      * 是否诊断依据（1-是，0-否）
@@ -173,11 +173,11 @@ public class IntroduceDetail implements Serializable {
         this.orderNo = orderNo;
     }
 
-    public Integer getPosition() {
+    public String getPosition() {
         return position;
     }
 
-    public void setPosition(Integer position) {
+    public void setPosition(String position) {
         this.position = position;
     }
 

icss-service/src/main/java/com/diagbot/enums/IntroducePositionEnum.java

@@ -9,7 +9,6 @@ import lombok.Setter;
  * @time: 2018/11/23 10:12
  */
 public enum IntroducePositionEnum implements KeyedNamed {
-    All(0, "都展示"),
     Push(1, "推送展示"),
     More(2, "更多展示"),
     CommonTreatment(3, "一般治疗展示"),

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

@@ -1,55 +1,51 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.validation.Valid;
-
-import org.springframework.stereotype.Component;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.diagbot.entity.BuriedSomeStatistical;
 import com.diagbot.service.impl.BuriedSomeStatisticalServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.vo.BuriedSomeStatisticalVO;
 import com.diagbot.vo.Taggeds;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2018年12月3日 上午9:24:35
  */
 @Component
-public class BuriedSomeStatisticalFacade extends BuriedSomeStatisticalServiceImpl{
+public class BuriedSomeStatisticalFacade extends BuriedSomeStatisticalServiceImpl {
+
+    /**
+     * 批量保存
+     *
+     * @param buriedSomeStatisticalVO
+     * @return
+     */
+    public boolean saveBuriedSomeStatistical(BuriedSomeStatisticalVO buriedSomeStatisticalVO) {
+        List<BuriedSomeStatistical> buriedList = new ArrayList<BuriedSomeStatistical>();
+        List<Taggeds> taggeds = buriedSomeStatisticalVO.getTaggeds();
+        for (Taggeds taggedsNew : taggeds) {
+            BuriedSomeStatistical buriedData = new BuriedSomeStatistical();
+            buriedData.setCreator(buriedSomeStatisticalVO.getDoctorId().toString());
+            buriedData.setDoctorId(buriedSomeStatisticalVO.getDoctorId());
+            buriedData.setGmtCreate(DateUtil.now());
+            buriedData.setHospitalDeptId(buriedSomeStatisticalVO.getHospitalDeptId());
+            buriedData.setHospitalId(buriedSomeStatisticalVO.getHospitalId());
+            buriedData.setInquiryCode(buriedSomeStatisticalVO.getInquiryCode());
+            buriedData.setPatientId(buriedSomeStatisticalVO.getPatientId());
+            buriedData.setLabelId(taggedsNew.getLabelId());
+            buriedData.setLabelName(taggedsNew.getLabelName());
+            buriedData.setOperationNum(taggedsNew.getOperationNum());
+            buriedData.setOperationType(taggedsNew.getOperationType());
+            buriedList.add(buriedData);
+        }
+
+        boolean res = insertCodeBatch(buriedList);
+        return res;
+    }
 
-	/**
-	 * 批量保存
-	 * @param buriedSomeStatisticalVO
-	 * @return
-	 */
-	public boolean saveBuriedSomeStatistical(BuriedSomeStatisticalVO buriedSomeStatisticalVO) {
-		List<BuriedSomeStatistical>  buriedList = new ArrayList<BuriedSomeStatistical>();
-		List<Taggeds> taggeds = buriedSomeStatisticalVO.getTaggeds();
-		for(Taggeds taggedsNew : taggeds){	
-			BuriedSomeStatistical buriedData =new BuriedSomeStatistical();
-			buriedData.setCreator(buriedSomeStatisticalVO.getDoctorId().toString());
-			buriedData.setDoctorId(buriedSomeStatisticalVO.getDoctorId());
-			buriedData.setGmtCreate(DateUtil.now());
-			buriedData.setHospitalDeptId(buriedSomeStatisticalVO.getHospitalDeptId());
-			buriedData.setHospitalId(buriedSomeStatisticalVO.getHospitalId());
-			buriedData.setInquiryCode(buriedSomeStatisticalVO.getInquiryCode());
-			buriedData.setPatientId(buriedSomeStatisticalVO.getPatientId());
-			buriedData.setLabelId(taggedsNew.getLabelId());
-			buriedData.setLabelName(taggedsNew.getLabelName());
-			buriedData.setOperationNum(taggedsNew.getOperationNum());
-			buriedData.setOperationType(taggedsNew.getOperationType());
-			buriedList.add(buriedData);
-		}
-		
-		boolean res = insertCodeBatch(buriedList);
-		return res;
-	}
 
-	
 }

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

@@ -19,13 +19,14 @@ import java.util.List;
 public class DeptInfoFacade extends DeptInfoServiceImpl {
 
     /**
-     *  获取科室信息
+     * 获取科室信息
+     *
      * @param deptInfoVO
      * @return
      */
     public List<DeptInfoDTO> getDeptInfo(DeptInfoVO deptInfoVO) {
-        List<DeptInfoDTO> deptInfoDTOList = this.getDeptInfos(deptInfoVO.getDeptCode(),deptInfoVO.getHospitalCode());
-        if(ListUtil.isEmpty(deptInfoDTOList)){
+        List<DeptInfoDTO> deptInfoDTOList = this.getDeptInfos(deptInfoVO.getDeptCode(), deptInfoVO.getHospitalCode());
+        if (ListUtil.isEmpty(deptInfoDTOList)) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
                     "获取科室信息失败");
         }

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

@@ -1,41 +1,41 @@
-package com.diagbot.facade;
-
-import java.util.List;
-
-import org.springframework.stereotype.Component;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.DisclaimerInformationDTO;
-import com.diagbot.dto.TemplateInfoDTO;
-import com.diagbot.entity.DisclaimerInformation;
-import com.diagbot.entity.VersionDetail;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.StatusEnum;
-import com.diagbot.service.impl.DisclaimerInformationServiceImpl;
-import com.diagbot.util.BeanUtil;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月27日 下午3:36:14
- */
-@Component
-public class DisclaimerInformationFacaed extends DisclaimerInformationServiceImpl {
-
-	/**
-	 * 
-	 * @return
-	 */
-	public List<DisclaimerInformationDTO> getDisclaimerInformation() {
-
-		QueryWrapper<DisclaimerInformation> disclaimerInformation = new QueryWrapper<>();
-		disclaimerInformation.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
-				.orderByAsc("order_no");
-		List<DisclaimerInformation> data = list(disclaimerInformation);
-		// getDisclaimerInformationAll();
-		List<DisclaimerInformationDTO> datas = BeanUtil.listCopyTo(data, DisclaimerInformationDTO.class);
-		return datas;
-	}
-
-}
+package com.diagbot.facade;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.TemplateInfoDTO;
+import com.diagbot.entity.DisclaimerInformation;
+import com.diagbot.entity.VersionDetail;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
+import com.diagbot.service.impl.DisclaimerInformationServiceImpl;
+import com.diagbot.util.BeanUtil;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月27日 下午3:36:14
+ */
+@Component
+public class DisclaimerInformationFacade extends DisclaimerInformationServiceImpl {
+
+	/**
+	 * 
+	 * @return
+	 */
+	public List<DisclaimerInformationDTO> getDisclaimerInformation() {
+
+		QueryWrapper<DisclaimerInformation> disclaimerInformation = new QueryWrapper<>();
+		disclaimerInformation.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+				.orderByAsc("order_no");
+		List<DisclaimerInformation> data = list(disclaimerInformation);
+		// getDisclaimerInformationAll();
+		List<DisclaimerInformationDTO> datas = BeanUtil.listCopyTo(data, DisclaimerInformationDTO.class);
+		return datas;
+	}
+
+}

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

@@ -1,13 +1,9 @@
 package com.diagbot.facade;
 
 import com.diagbot.dto.DoctorInfoDTO;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.DoctorInfoServiceImpl;
-import com.diagbot.util.ListUtil;
 import com.diagbot.vo.DoctorInfoVO;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -21,15 +17,12 @@ public class DoctorInfoFacade extends DoctorInfoServiceImpl {
 
     /**
      * 获取医生信息
+     *
      * @param doctorInfoVo
      * @return
      */
-    public List<DoctorInfoDTO> getDoctorInfo(@RequestBody DoctorInfoVO doctorInfoVo) {
-        List<DoctorInfoDTO> doctorInfoDTOList = this.getDoctorInfos(doctorInfoVo.getDoctorCode(),doctorInfoVo.getHosptialCode(),doctorInfoVo.getDeptCode());
-        if(ListUtil.isEmpty(doctorInfoDTOList)){
-            throw new CommonException(CommonErrorCode.NOT_EXISTS,
-                    "获取医生信息失败");
-        }
+    public List<DoctorInfoDTO> getDoctorInfo(DoctorInfoVO doctorInfoVo) {
+        List<DoctorInfoDTO> doctorInfoDTOList = this.getDoctorInfos(doctorInfoVo.getDoctorCode(), doctorInfoVo.getHosptialCode(), doctorInfoVo.getDeptCode());
         return doctorInfoDTOList;
     }
 }

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

@@ -1,12 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.validation.Valid;
-
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.entity.DoctorPageMode;
@@ -15,10 +8,14 @@ import com.diagbot.service.impl.DoctorPageModeServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.vo.DoctorIdVO;
 import com.diagbot.vo.DoctorPageModeVO;
+import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
- * 
  * @author wangfeng
  * @Description: 医生页面模式设置
  * @date 2018年11月20日 下午2:56:01
@@ -26,55 +23,57 @@ import org.springframework.transaction.annotation.Transactional;
 @Component
 public class DoctorPageModeFacade extends DoctorPageModeServiceImpl {
 
-	/**
-	 * 保存医生页面结构设置信息
-	 * @param doctorPageModeVO
-	 * @return
-	 */
-	@Transactional
-	public boolean saveDoctorPageMode(@Valid DoctorPageModeVO doctorPageModeVO) {
-		QueryWrapper<DoctorPageMode> doctorPageModeWrapper = new QueryWrapper<>();
-		Map<String, Object> mapAll = new HashMap<>();
-		mapAll.put("doctor_id", doctorPageModeVO.getDoctorId());
-		mapAll.put("is_deleted",IsDeleteEnum.N.getKey());
-		doctorPageModeWrapper.allEq(mapAll);
-		DoctorPageMode datas = getOne(doctorPageModeWrapper);
-		boolean res = false;
-		if (datas != null) {
-			UpdateWrapper<DoctorPageMode> doctorPageModeUpdate = new UpdateWrapper<>();
-			doctorPageModeUpdate.allEq(mapAll)
-			               .set("mode_classify",doctorPageModeVO.getModeClassify())
-			               .set("mode_value",doctorPageModeVO.getModeValue() )
-			               .set("modifier",doctorPageModeVO.getDoctorId().toString() )
-			               .set("gmt_modified", DateUtil.now());
-			 res = update(new DoctorPageMode(), doctorPageModeUpdate);
-			//throw new CommonException(CommonErrorCode.NOT_EXISTS, "该模板名已存在");
-		}else {
-			DoctorPageMode doctorPageMode = new DoctorPageMode();
-			doctorPageMode.setDoctorId(doctorPageModeVO.getDoctorId());
-			doctorPageMode.setModeClassify(doctorPageModeVO.getModeClassify());
-			doctorPageMode.setModeValue(doctorPageModeVO.getModeValue());
-			doctorPageMode.setCreator(doctorPageModeVO.getDoctorId().toString());
-			doctorPageMode.setGmtCreate(DateUtil.now());
-			res = save(doctorPageMode);
-		}
-		
-		return res;
-	}
+    /**
+     * 保存医生页面结构设置信息
+     *
+     * @param doctorPageModeVO
+     * @return
+     */
+    @Transactional
+    public boolean saveDoctorPageMode(@Valid DoctorPageModeVO doctorPageModeVO) {
+        QueryWrapper<DoctorPageMode> doctorPageModeWrapper = new QueryWrapper<>();
+        Map<String, Object> mapAll = new HashMap<>();
+        mapAll.put("doctor_id", doctorPageModeVO.getDoctorId());
+        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+        doctorPageModeWrapper.allEq(mapAll);
+        DoctorPageMode datas = getOne(doctorPageModeWrapper);
+        boolean res = false;
+        if (datas != null) {
+            UpdateWrapper<DoctorPageMode> doctorPageModeUpdate = new UpdateWrapper<>();
+            doctorPageModeUpdate.allEq(mapAll)
+                    .set("mode_classify", doctorPageModeVO.getModeClassify())
+                    .set("mode_value", doctorPageModeVO.getModeValue())
+                    .set("modifier", doctorPageModeVO.getDoctorId().toString())
+                    .set("gmt_modified", DateUtil.now());
+            res = update(new DoctorPageMode(), doctorPageModeUpdate);
+            //throw new CommonException(CommonErrorCode.NOT_EXISTS, "该模板名已存在");
+        } else {
+            DoctorPageMode doctorPageMode = new DoctorPageMode();
+            doctorPageMode.setDoctorId(doctorPageModeVO.getDoctorId());
+            doctorPageMode.setModeClassify(doctorPageModeVO.getModeClassify());
+            doctorPageMode.setModeValue(doctorPageModeVO.getModeValue());
+            doctorPageMode.setCreator(doctorPageModeVO.getDoctorId().toString());
+            doctorPageMode.setGmtCreate(DateUtil.now());
+            res = save(doctorPageMode);
+        }
+
+        return res;
+    }
 
-	/**
-	 * 获取医生页面结构设置信息
-	 * @param doctorIdVO
-	 * @return
-	 */
-	public DoctorPageMode getDoctorPageMode(@Valid DoctorIdVO doctorIdVO) {
-		QueryWrapper<DoctorPageMode> doctorPageModeWrapper = new QueryWrapper<>();
-		Map<String, Object> mapAll = new HashMap<>();
-		mapAll.put("doctor_id", doctorIdVO.getDoctorId());
-		mapAll.put("is_deleted",IsDeleteEnum.N.getKey());
-		doctorPageModeWrapper.allEq(mapAll);
-		DoctorPageMode doctorPageModeData = getOne(doctorPageModeWrapper);
-		return doctorPageModeData;
-	}
+    /**
+     * 获取医生页面结构设置信息
+     *
+     * @param doctorIdVO
+     * @return
+     */
+    public DoctorPageMode getDoctorPageMode(@Valid DoctorIdVO doctorIdVO) {
+        QueryWrapper<DoctorPageMode> doctorPageModeWrapper = new QueryWrapper<>();
+        Map<String, Object> mapAll = new HashMap<>();
+        mapAll.put("doctor_id", doctorIdVO.getDoctorId());
+        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+        doctorPageModeWrapper.allEq(mapAll);
+        DoctorPageMode doctorPageModeData = getOne(doctorPageModeWrapper);
+        return doctorPageModeData;
+    }
 
 }

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

@@ -1,15 +1,11 @@
-/**
- * 
- */
 package com.diagbot.facade;
 
-import org.springframework.stereotype.Component;
-
 import com.diagbot.service.impl.HospitalDeptServiceImpl;
+import org.springframework.stereotype.Component;
 
 /**
- * @Description
  * @author rgb
+ * @Description
  * @time 2018年12月11日上午11:32:13
  */
 @Component

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

@@ -1,17 +1,13 @@
 package com.diagbot.facade;
 
-import java.util.List;
-
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.entity.HospitalInfo;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.HospitalInfoServiceImpl;
-import com.diagbot.util.ListUtil;
 import com.diagbot.vo.HospitalInfoVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
  * @Description:
@@ -23,29 +19,27 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
 
     /**
      * 获取医院信息
+     *
      * @param hospitalInfoVO
      * @return
      */
     public List<HospitalInfoDTO> getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
         List<HospitalInfoDTO> hospitalInfoDTOList = this.getHospitalInfos(hospitalInfoVO);
-        if(ListUtil.isEmpty(hospitalInfoDTOList)){
-            throw new CommonException(CommonErrorCode.NOT_EXISTS,
-                    "获取医院信息失败");
-        }
         return hospitalInfoDTOList;
     }
-    
+
     /**
      * 通过医院编码获取医院信息
+     *
      * @param code 医院编码
      * @return
      */
-    public HospitalInfo getHospitalByCode(String code){
-    	QueryWrapper<HospitalInfo> queryWrapper = new QueryWrapper<HospitalInfo>();
-    	queryWrapper.eq("is_deleted", "N");
-    	queryWrapper.eq("code", code);
-    	queryWrapper.eq("status", 1);
-    	return this.getOne(queryWrapper);
+    public HospitalInfo getHospitalByCode(String code) {
+        QueryWrapper<HospitalInfo> queryWrapper = new QueryWrapper<HospitalInfo>();
+        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("code", code);
+        queryWrapper.eq("status", 1);
+        return this.getOne(queryWrapper);
     }
-    
+
 }

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

@@ -1,67 +1,70 @@
 package com.diagbot.facade;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.entity.InquiryDetail;
 import com.diagbot.service.impl.InquiryDetailServiceImpl;
 import com.diagbot.util.ListUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
- * @Description
  * @author rengb
+ * @Description
  * @time 2018年11月23日下午2:08:08
  */
 @Component
 public class InquiryDetailFacade extends InquiryDetailServiceImpl {
-	
-	/**
-	 * 批量保存问诊明细
-	 * @param inquiryDetailList
-	 */
-	public void saveInquiryDetails(List<InquiryDetail> inquiryDetailList){
-		if(ListUtil.isNotEmpty(inquiryDetailList)){
-			baseMapper.saveInquiryDetails(inquiryDetailList);
-		}
-	}
-	
-	/**
-	 * 根据问诊记录id删除问诊记录明细
-	 * @param inquiryId
-	 */
-	public void removeByInquiryId(Long inquiryId){
-		QueryWrapper<InquiryDetail> queryWrapper = new QueryWrapper<InquiryDetail>();
-		queryWrapper.eq("inquiry_id", inquiryId);
-		this.remove(queryWrapper);
-	}
-	
-	/**
-	 * 根据病历id获取病历明细
-	 * @param inquiryId
-	 * @return
-	 */
-	public List<InquiryDetail> getListByInquryId(Long inquiryId){
-		QueryWrapper<InquiryDetail> queryWrapper = new QueryWrapper<InquiryDetail>();
-		queryWrapper.eq("is_deleted", "N");
-		queryWrapper.eq("inquiry_id", inquiryId);
-		return this.list(queryWrapper);
-	}
-	
-	/**
-	 * 根据病历id集合获取病历明细
-	 * @param inquiryIds
-	 * @return
-	 */
-	public Map<Long,List<InquiryDetail>> getDetailsByInquryIds(List<Long> inquiryIds){
-		QueryWrapper<InquiryDetail> queryWrapper = new QueryWrapper<InquiryDetail>();
-		queryWrapper.eq("is_deleted", "N").in("inquiry_id", inquiryIds);
-		List<InquiryDetail> inquiryDetails = this.list(queryWrapper);
-		return inquiryDetails.stream().collect(Collectors.groupingBy(InquiryDetail::getInquiryId));
-	}
-	
+
+    /**
+     * 批量保存问诊明细
+     *
+     * @param inquiryDetailList
+     */
+    public void saveInquiryDetails(List<InquiryDetail> inquiryDetailList) {
+        if (ListUtil.isNotEmpty(inquiryDetailList)) {
+            baseMapper.saveInquiryDetails(inquiryDetailList);
+        }
+    }
+
+    /**
+     * 根据问诊记录id删除问诊记录明细
+     *
+     * @param inquiryId
+     */
+    public void removeByInquiryId(Long inquiryId) {
+        QueryWrapper<InquiryDetail> queryWrapper = new QueryWrapper<InquiryDetail>();
+        queryWrapper.eq("inquiry_id", inquiryId);
+        this.remove(queryWrapper);
+    }
+
+    /**
+     * 根据病历id获取病历明细
+     *
+     * @param inquiryId
+     * @return
+     */
+    public List<InquiryDetail> getListByInquryId(Long inquiryId) {
+        QueryWrapper<InquiryDetail> queryWrapper = new QueryWrapper<InquiryDetail>();
+        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("inquiry_id", inquiryId);
+        return this.list(queryWrapper);
+    }
+
+    /**
+     * 根据病历id集合获取病历明细
+     *
+     * @param inquiryIds
+     * @return
+     */
+    public Map<Long, List<InquiryDetail>> getDetailsByInquryIds(List<Long> inquiryIds) {
+        QueryWrapper<InquiryDetail> queryWrapper = new QueryWrapper<InquiryDetail>();
+        queryWrapper.eq("is_deleted", "N").in("inquiry_id", inquiryIds);
+        List<InquiryDetail> inquiryDetails = this.list(queryWrapper);
+        return inquiryDetails.stream().collect(Collectors.groupingBy(InquiryDetail::getInquiryId));
+    }
+
 
 }

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

@@ -1,17 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.HisInquiryDTO;
@@ -33,198 +21,212 @@ import com.diagbot.vo.HisInquirysVO;
 import com.diagbot.vo.ReadInquiryVO;
 import com.diagbot.vo.SaveInquiryDetailVO;
 import com.diagbot.vo.SaveInquiryVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
- * @Description
  * @author rengb
+ * @Description
  * @time 2018年11月23日下午2:08:08
  */
 @Component
 public class InquiryInfoFacade extends InquiryInfoServiceImpl {
-	
-	@Autowired
-	private InquiryDetailFacade inquiryDetailFacade;
-	@Autowired
-	private HospitalInfoFacade hospitalInfoFacade;
-	@Autowired
-	private PatientInfoFacade patientInfoFacade;
-	@Autowired
-	private DoctorInfoFacade doctorInfoFacade;
-	@Autowired
-	private HospitalDeptFacade hospitalDeptFacade;
-	
-	
-	
-	/**
-	 * 问诊记录保存
-	 * @param saveInquiryVO
-	 * @return
-	 */
-	@Transactional
-	public SaveInquiryDTO saveInquiry(SaveInquiryVO saveInquiryVO){
-		SaveInquiryDTO saveInquiryDTO = new SaveInquiryDTO();
-		Date now = new Date();
-		
-		QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
-		queryWrapper.eq("is_deleted", "N");
-		queryWrapper.eq("hospital_id", saveInquiryVO.getHospitalId());
-		queryWrapper.eq("hospital_dept_id", saveInquiryVO.getHospitalDeptId());
-		queryWrapper.eq("doctor_id", saveInquiryVO.getDoctorId());
-		queryWrapper.eq("patient_id", saveInquiryVO.getPatientId());
-		queryWrapper.eq("inquiry_code", saveInquiryVO.getInquiryCode());
-		InquiryInfo inquiryInfo = this.getOne(queryWrapper);
-		
-		Long inquiryId = null;
-		InquiryInfo inquiryInfoSave = new InquiryInfo();
-		inquiryInfoSave.setHospitalId(saveInquiryVO.getHospitalId());
-		inquiryInfoSave.setHospitalDeptId(saveInquiryVO.getHospitalDeptId());
-		inquiryInfoSave.setDoctorId(saveInquiryVO.getDoctorId());
-		inquiryInfoSave.setPatientId(saveInquiryVO.getPatientId());
-		inquiryInfoSave.setInquiryCode(saveInquiryVO.getInquiryCode());
-		inquiryInfoSave.setRegVisitedState(saveInquiryVO.getRegVisitedState());
-		inquiryInfoSave.setType(saveInquiryVO.getType());
-		inquiryInfoSave.setDiagnose(saveInquiryVO.getDiagnose());
-		inquiryInfoSave.setSign(saveInquiryVO.getSign());
-		inquiryInfoSave.setDataJson(saveInquiryVO.getDataJson());
-		if(inquiryInfo==null){
-			inquiryInfoSave.setGmtCreate(now);
-			this.save(inquiryInfoSave);
-			inquiryId = inquiryInfoSave.getId();
-		}else{
-			inquiryId = inquiryInfo.getId();
-			inquiryInfoSave.setId(inquiryId);
-			inquiryInfoSave.setGmtModified(now);
-			this.updateById(inquiryInfoSave);
-			
-			inquiryDetailFacade.removeByInquiryId(inquiryId);
-		}
-		
-		List<InquiryDetail> inquiryDetailList = new ArrayList<>();
-		for(SaveInquiryDetailVO i : saveInquiryVO.getDetailList()){
-			if(StringUtil.isBlank(i.getContent())){
-				continue;
-			}
-			InquiryDetail inquiryDetail = new InquiryDetail();
-			inquiryDetail.setInquiryId(inquiryId);
-			inquiryDetail.setType(i.getType());
-			inquiryDetail.setContent(i.getContent());
-			inquiryDetail.setGmtCreate(now);
-			inquiryDetailList.add(inquiryDetail);
-		}
-		if(inquiryDetailList.size()>0){
-			inquiryDetailFacade.saveInquiryDetails(inquiryDetailList);
-		}
-		
-		saveInquiryDTO.setInquiryId(inquiryId);
-		return saveInquiryDTO;
-	}
-	
-	/**
-	 * 问诊记录回显
-	 * @param readInquiryVO
-	 * @return
-	 */
-	public ReadInquiryDTO readInquiry(ReadInquiryVO readInquiryVO){
-		ReadInquiryDTO readInquiryDTO = new ReadInquiryDTO();
-		
-		HospitalInfo hospitalInfo = hospitalInfoFacade.getHospitalByCode(readInquiryVO.getHospitalCode());
-		PatientInfo patientInfo = patientInfoFacade.getPatientByCode(readInquiryVO.getHospitalCode(), readInquiryVO.getPatientCode()); 
-		
-		Map<String,Object> map = new HashMap<>();
-		map.put("hospitalId", hospitalInfo.getId());
-		map.put("patientId", patientInfo.getId());
-		InquiryInfo inquiryInfo = baseMapper.getPatientLast(map);
-		
-		if(inquiryInfo!=null){
-			readInquiryDTO.setDataJson(inquiryInfo.getDataJson());
-		}
-		
-		return readInquiryDTO;
-	}
-	
-	/**
-	 * 历史病历列表
-	 * @param hisInquirysVO
-	 * @return
-	 */
-	public List<HisInquiryDTO> hisInquirys(HisInquirysVO hisInquirysVO){
-		QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
-		queryWrapper.eq("is_deleted", "N");
-		queryWrapper.eq("hospital_id", hisInquirysVO.getHospitalId());
-		queryWrapper.eq("hospital_dept_id", hisInquirysVO.getHospitalDeptId());
-		queryWrapper.eq("doctor_id", hisInquirysVO.getDoctorId());
-		if(hisInquirysVO.getPatientId()!=null){
-			queryWrapper.eq("patient_id", hisInquirysVO.getPatientId());
-		}
-		if(hisInquirysVO.getType()!=null){
-			queryWrapper.eq("type", hisInquirysVO.getType());
-		}
-		if(hisInquirysVO.getSign()!=null){
-			queryWrapper.eq("sign", hisInquirysVO.getSign());
-		}
-		if(hisInquirysVO.getStartDate()!=null){
-			queryWrapper.ge("gmt_create", hisInquirysVO.getStartDate());
-		}
-		if(hisInquirysVO.getEndDate()!=null){
-			queryWrapper.le("gmt_create", hisInquirysVO.getEndDate());
-		}
-		if(hisInquirysVO.getOrderType()==1){
-			queryWrapper.orderByDesc("gmt_create");
-		}else if(hisInquirysVO.getOrderType()==2){
-			queryWrapper.orderByAsc("gmt_create");
-		}
-		List<InquiryInfo> inquiryInfoList = this.list(queryWrapper);
-		if(inquiryInfoList.size()==0){
-			return null;
-		}
-		
-		List<Long> hospitalDeptIdList = inquiryInfoList.stream().map(i->i.getHospitalDeptId()).collect(Collectors.toList());
-		List<Long> doctorIdList = inquiryInfoList.stream().map(i->i.getDoctorId()).collect(Collectors.toList());
-		List<Long> patientIdList = inquiryInfoList.stream().map(i->i.getPatientId()).collect(Collectors.toList());
-		List<Long> inquiryIdList = inquiryInfoList.stream().map(i->i.getId()).collect(Collectors.toList());
-		
-		Map<Long,HospitalDept> hospitalDeptMap = hospitalDeptFacade.listByIds(hospitalDeptIdList).stream().filter(i->i.getIsDeleted().equals("N")&&i.getStatus()==1).collect(Collectors.toMap(HospitalDept::getId, i->i));
-		Map<Long,DoctorInfo> doctorInfoMap = doctorInfoFacade.listByIds(doctorIdList).stream().filter(i->i.getIsDeleted().equals("N")).collect(Collectors.toMap(DoctorInfo::getId, i->i));
-		Map<Long,PatientInfo> patientInfoMap = patientInfoFacade.listByIds(patientIdList).stream().filter(i->i.getIsDeleted().equals("N")).collect(Collectors.toMap(PatientInfo::getId, i->i));
-		Map<Long,List<InquiryDetail>> inquiryDetailMap = inquiryDetailFacade.getDetailsByInquryIds(inquiryIdList);
-		
-		List<HisInquiryDTO> hisInquiryDTOList = new ArrayList<>();
-		inquiryInfoList.forEach(i->{
-			HisInquiryDTO hisInquiryDTO = new HisInquiryDTO();
-			BeanUtil.copyProperties(i, hisInquiryDTO);
-			hisInquiryDTO.setInquiryDate(i.getGmtCreate());
-			hisInquiryDTO.setInquiryTime(i.getGmtCreate());
-			hisInquiryDTO.setHospitalDeptName(Optional.ofNullable(hospitalDeptMap.get(i.getHospitalDeptId())).map(t->t.getName()).orElse(null));
-			hisInquiryDTO.setDoctorName(Optional.ofNullable(doctorInfoMap.get(i.getDoctorId())).map(t->t.getName()).orElse(null));
-			PatientInfo patientInfo = patientInfoMap.get(i.getPatientId());
-			if(patientInfo!=null){
-				hisInquiryDTO.setPatientName(patientInfo.getName());
-				hisInquiryDTO.setPatientIdNo(patientInfo.getIdNo());
-				hisInquiryDTO.setPatientSex(SexTypeEnum.getName(patientInfo.getSex()));
-				hisInquiryDTO.setPatientAge(DateUtil.yearCompare(patientInfo.getBirthday(),DateUtil.now()));
-			}
-			
-			hisInquiryDTO.setDetailList(inquiryDetailMap.get(i.getId()));
-			hisInquiryDTOList.add(hisInquiryDTO);
-		});
-		
-		
-		return hisInquiryDTOList;
-	}
-	
-	/**
-	 * 病历详情
-	 * @param getInquiryDetailVO
-	 * @return
-	 */
-	public GetInquiryDetailDTO getInquiryDetail(GetInquiryDetailVO getInquiryDetailVO){
-		GetInquiryDetailDTO getInquiryDetailDTO = new GetInquiryDetailDTO();
-		
-		List<InquiryDetail> inquiryDetailList = inquiryDetailFacade.getListByInquryId(getInquiryDetailVO.getInquiryId());
-		
-		getInquiryDetailDTO.setInquiryDetailList(inquiryDetailList);
-		
-		return getInquiryDetailDTO;
-	}
+
+    @Autowired
+    private InquiryDetailFacade inquiryDetailFacade;
+    @Autowired
+    private HospitalInfoFacade hospitalInfoFacade;
+    @Autowired
+    private PatientInfoFacade patientInfoFacade;
+    @Autowired
+    private DoctorInfoFacade doctorInfoFacade;
+    @Autowired
+    private HospitalDeptFacade hospitalDeptFacade;
+
+
+    /**
+     * 问诊记录保存
+     *
+     * @param saveInquiryVO
+     * @return
+     */
+    @Transactional
+    public SaveInquiryDTO saveInquiry(SaveInquiryVO saveInquiryVO) {
+        SaveInquiryDTO saveInquiryDTO = new SaveInquiryDTO();
+        Date now = new Date();
+
+        QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
+        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("hospital_id", saveInquiryVO.getHospitalId());
+        queryWrapper.eq("hospital_dept_id", saveInquiryVO.getHospitalDeptId());
+        queryWrapper.eq("doctor_id", saveInquiryVO.getDoctorId());
+        queryWrapper.eq("patient_id", saveInquiryVO.getPatientId());
+        queryWrapper.eq("inquiry_code", saveInquiryVO.getInquiryCode());
+        InquiryInfo inquiryInfo = this.getOne(queryWrapper);
+
+        Long inquiryId = null;
+        InquiryInfo inquiryInfoSave = new InquiryInfo();
+        inquiryInfoSave.setHospitalId(saveInquiryVO.getHospitalId());
+        inquiryInfoSave.setHospitalDeptId(saveInquiryVO.getHospitalDeptId());
+        inquiryInfoSave.setDoctorId(saveInquiryVO.getDoctorId());
+        inquiryInfoSave.setPatientId(saveInquiryVO.getPatientId());
+        inquiryInfoSave.setInquiryCode(saveInquiryVO.getInquiryCode());
+        inquiryInfoSave.setRegVisitedState(saveInquiryVO.getRegVisitedState());
+        inquiryInfoSave.setType(saveInquiryVO.getType());
+        inquiryInfoSave.setDiagnose(saveInquiryVO.getDiagnose());
+        inquiryInfoSave.setSign(saveInquiryVO.getSign());
+        inquiryInfoSave.setDataJson(saveInquiryVO.getDataJson());
+        if (inquiryInfo == null) {
+            inquiryInfoSave.setGmtCreate(now);
+            this.save(inquiryInfoSave);
+            inquiryId = inquiryInfoSave.getId();
+        } else {
+            inquiryId = inquiryInfo.getId();
+            inquiryInfoSave.setId(inquiryId);
+            inquiryInfoSave.setGmtModified(now);
+            this.updateById(inquiryInfoSave);
+
+            inquiryDetailFacade.removeByInquiryId(inquiryId);
+        }
+
+        List<InquiryDetail> inquiryDetailList = new ArrayList<>();
+        for (SaveInquiryDetailVO i : saveInquiryVO.getDetailList()) {
+            if (StringUtil.isBlank(i.getContent())) {
+                continue;
+            }
+            InquiryDetail inquiryDetail = new InquiryDetail();
+            inquiryDetail.setInquiryId(inquiryId);
+            inquiryDetail.setType(i.getType());
+            inquiryDetail.setContent(i.getContent());
+            inquiryDetail.setGmtCreate(now);
+            inquiryDetailList.add(inquiryDetail);
+        }
+        if (inquiryDetailList.size() > 0) {
+            inquiryDetailFacade.saveInquiryDetails(inquiryDetailList);
+        }
+
+        saveInquiryDTO.setInquiryId(inquiryId);
+        return saveInquiryDTO;
+    }
+
+    /**
+     * 问诊记录回显
+     *
+     * @param readInquiryVO
+     * @return
+     */
+    public ReadInquiryDTO readInquiry(ReadInquiryVO readInquiryVO) {
+        ReadInquiryDTO readInquiryDTO = new ReadInquiryDTO();
+
+        HospitalInfo hospitalInfo = hospitalInfoFacade.getHospitalByCode(readInquiryVO.getHospitalCode());
+        PatientInfo patientInfo = patientInfoFacade.getPatientByCode(readInquiryVO.getHospitalCode(), readInquiryVO.getPatientCode());
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("hospitalId", hospitalInfo.getId());
+        map.put("patientId", patientInfo.getId());
+        InquiryInfo inquiryInfo = baseMapper.getPatientLast(map);
+
+        if (inquiryInfo != null) {
+            readInquiryDTO.setDataJson(inquiryInfo.getDataJson());
+        }
+
+        return readInquiryDTO;
+    }
+
+    /**
+     * 历史病历列表
+     *
+     * @param hisInquirysVO
+     * @return
+     */
+    public List<HisInquiryDTO> hisInquirys(HisInquirysVO hisInquirysVO) {
+        QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
+        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("hospital_id", hisInquirysVO.getHospitalId());
+        queryWrapper.eq("hospital_dept_id", hisInquirysVO.getHospitalDeptId());
+        queryWrapper.eq("doctor_id", hisInquirysVO.getDoctorId());
+        if (hisInquirysVO.getPatientId() != null) {
+            queryWrapper.eq("patient_id", hisInquirysVO.getPatientId());
+        }
+        if (hisInquirysVO.getType() != null) {
+            queryWrapper.eq("type", hisInquirysVO.getType());
+        }
+        if (hisInquirysVO.getSign() != null) {
+            queryWrapper.eq("sign", hisInquirysVO.getSign());
+        }
+        if (hisInquirysVO.getStartDate() != null) {
+            queryWrapper.ge("gmt_create", hisInquirysVO.getStartDate());
+        }
+        if (hisInquirysVO.getEndDate() != null) {
+            queryWrapper.le("gmt_create", hisInquirysVO.getEndDate());
+        }
+        if (hisInquirysVO.getOrderType() == 1) {
+            queryWrapper.orderByDesc("gmt_create");
+        } else if (hisInquirysVO.getOrderType() == 2) {
+            queryWrapper.orderByAsc("gmt_create");
+        }
+        List<InquiryInfo> inquiryInfoList = this.list(queryWrapper);
+        if (inquiryInfoList.size() == 0) {
+            return null;
+        }
+
+        List<Long> hospitalDeptIdList = inquiryInfoList.stream().map(i -> i.getHospitalDeptId()).collect(Collectors.toList());
+        List<Long> doctorIdList = inquiryInfoList.stream().map(i -> i.getDoctorId()).collect(Collectors.toList());
+        List<Long> patientIdList = inquiryInfoList.stream().map(i -> i.getPatientId()).collect(Collectors.toList());
+        List<Long> inquiryIdList = inquiryInfoList.stream().map(i -> i.getId()).collect(Collectors.toList());
+
+        Map<Long, HospitalDept> hospitalDeptMap = hospitalDeptFacade.listByIds(hospitalDeptIdList).stream().filter(i -> i.getIsDeleted().equals("N") && i.getStatus() == 1).collect(Collectors.toMap(HospitalDept::getId, i -> i));
+        Map<Long, DoctorInfo> doctorInfoMap = doctorInfoFacade.listByIds(doctorIdList).stream().filter(i -> i.getIsDeleted().equals("N")).collect(Collectors.toMap(DoctorInfo::getId, i -> i));
+        Map<Long, PatientInfo> patientInfoMap = patientInfoFacade.listByIds(patientIdList).stream().filter(i -> i.getIsDeleted().equals("N")).collect(Collectors.toMap(PatientInfo::getId, i -> i));
+        Map<Long, List<InquiryDetail>> inquiryDetailMap = inquiryDetailFacade.getDetailsByInquryIds(inquiryIdList);
+
+        List<HisInquiryDTO> hisInquiryDTOList = new ArrayList<>();
+        inquiryInfoList.forEach(i -> {
+            HisInquiryDTO hisInquiryDTO = new HisInquiryDTO();
+            BeanUtil.copyProperties(i, hisInquiryDTO);
+            hisInquiryDTO.setInquiryDate(i.getGmtCreate());
+            hisInquiryDTO.setInquiryTime(i.getGmtCreate());
+            hisInquiryDTO.setHospitalDeptName(Optional.ofNullable(hospitalDeptMap.get(i.getHospitalDeptId())).map(t -> t.getName()).orElse(null));
+            hisInquiryDTO.setDoctorName(Optional.ofNullable(doctorInfoMap.get(i.getDoctorId())).map(t -> t.getName()).orElse(null));
+            PatientInfo patientInfo = patientInfoMap.get(i.getPatientId());
+            if (patientInfo != null) {
+                hisInquiryDTO.setPatientName(patientInfo.getName());
+                hisInquiryDTO.setPatientIdNo(patientInfo.getIdNo());
+                hisInquiryDTO.setPatientSex(SexTypeEnum.getName(patientInfo.getSex()));
+                hisInquiryDTO.setPatientAge(DateUtil.yearCompare(patientInfo.getBirthday(), DateUtil.now()));
+            }
+
+            hisInquiryDTO.setDetailList(inquiryDetailMap.get(i.getId()));
+            hisInquiryDTOList.add(hisInquiryDTO);
+        });
+
+
+        return hisInquiryDTOList;
+    }
+
+    /**
+     * 病历详情
+     *
+     * @param getInquiryDetailVO
+     * @return
+     */
+    public GetInquiryDetailDTO getInquiryDetail(GetInquiryDetailVO getInquiryDetailVO) {
+        GetInquiryDetailDTO getInquiryDetailDTO = new GetInquiryDetailDTO();
+
+        List<InquiryDetail> inquiryDetailList = inquiryDetailFacade.getListByInquryId(getInquiryDetailVO.getInquiryId());
+
+        getInquiryDetailDTO.setInquiryDetailList(inquiryDetailList);
+
+        return getInquiryDetailDTO;
+    }
 
 }

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

@@ -1,15 +1,12 @@
 package com.diagbot.facade;
 
-import java.io.InputStream;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-
+import com.diagbot.dto.RespDTO;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.LisExcelResVO;
+import com.diagbot.vo.LisExcelWrapperVO;
+import com.diagbot.vo.LitAssayVO;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -21,16 +18,16 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.diagbot.dto.RespDTO;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.util.StringUtil;
-import com.diagbot.vo.LisExcelResVO;
-import com.diagbot.vo.LisExcelWrapperVO;
-import com.diagbot.vo.LitAssayVO;
+import javax.servlet.http.HttpServletRequest;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
- * 
  * @author wangfeng
  * @Description: 化验导入
  * @date 2018年11月29日 上午10:16:35
@@ -38,167 +35,167 @@ import com.diagbot.vo.LitAssayVO;
 @Component
 public class LisExcelResFacade {
 
-	public RespDTO<LitAssayVO> lisExcelAnalysis(MultipartFile file, HttpServletRequest request) {
+    public RespDTO<LitAssayVO> lisExcelAnalysis(MultipartFile file, HttpServletRequest request) {
 
-		List<String> messages = new ArrayList<>();
-		List<LisExcelWrapperVO> lisExcelWrapperList = new ArrayList<>();
-		InputStream inputStream = null;
-		Workbook wb = null;
-		try {
-			if (!file.isEmpty()) {
-				inputStream = file.getInputStream();
-				if (inputStream.available() > 512000) {
-					messages.add("化验文件最大支持500KB！");
-				} else {
-					String fileName = file.getOriginalFilename();
-					if (fileName.lastIndexOf(".") != -1) {
-						String type = fileName.substring(fileName.lastIndexOf("."));
-						if (type.equals(".xls")) {
-							wb = new HSSFWorkbook(inputStream);
-						} else if (type.equals(".xlsx")) {
-							wb = new XSSFWorkbook(inputStream);
-						}
-						if (wb != null) {
-							Sheet sheet = wb.getSheetAt(0);
-							int count = 0;
-							String mealName, itemName, unit, value, max, min, time;
-							for (Row row : sheet) {
-								count++;
-								try {
-									if (row != null) {
-										mealName = getValue(row.getCell(0)).trim().replace(" ", "");
-										itemName = getValue(row.getCell(1)).trim().replace(" ", "");
-										unit = getValue(row.getCell(2)).trim();
-										value = getValue(row.getCell(3)).trim();
-										min = getValue(row.getCell(4)).trim();
-										max = getValue(row.getCell(5)).trim();
-										time = getValue(row.getCell(6)).trim();
-										type = getValue(row.getCell(7)).trim();
-									} else {
-										mealName = null;
-										itemName = null;
-										unit = null;
-										value = null;
-										min = null;
-										max = null;
-										time = null;
-										type = null;
-									}
+        List<String> messages = new ArrayList<>();
+        List<LisExcelWrapperVO> lisExcelWrapperList = new ArrayList<>();
+        InputStream inputStream = null;
+        Workbook wb = null;
+        try {
+            if (!file.isEmpty()) {
+                inputStream = file.getInputStream();
+                if (inputStream.available() > 512000) {
+                    messages.add("化验文件最大支持500KB！");
+                } else {
+                    String fileName = file.getOriginalFilename();
+                    if (fileName.lastIndexOf(".") != -1) {
+                        String type = fileName.substring(fileName.lastIndexOf("."));
+                        if (type.equals(".xls")) {
+                            wb = new HSSFWorkbook(inputStream);
+                        } else if (type.equals(".xlsx")) {
+                            wb = new XSSFWorkbook(inputStream);
+                        }
+                        if (wb != null) {
+                            Sheet sheet = wb.getSheetAt(0);
+                            int count = 0;
+                            String mealName, itemName, unit, value, max, min, time;
+                            for (Row row : sheet) {
+                                count++;
+                                try {
+                                    if (row != null) {
+                                        mealName = getValue(row.getCell(0)).trim().replace(" ", "");
+                                        itemName = getValue(row.getCell(1)).trim().replace(" ", "");
+                                        unit = getValue(row.getCell(2)).trim();
+                                        value = getValue(row.getCell(3)).trim();
+                                        min = getValue(row.getCell(4)).trim();
+                                        max = getValue(row.getCell(5)).trim();
+                                        time = getValue(row.getCell(6)).trim();
+                                        type = getValue(row.getCell(7)).trim();
+                                    } else {
+                                        mealName = null;
+                                        itemName = null;
+                                        unit = null;
+                                        value = null;
+                                        min = null;
+                                        max = null;
+                                        time = null;
+                                        type = null;
+                                    }
 
-									if (StringUtil.isEmpty(mealName) && StringUtil.isEmpty(itemName)
-											&& StringUtil.isEmpty(value)&& StringUtil.isEmpty(type)) {
-										continue;
-									}
+                                    if (StringUtil.isEmpty(mealName) && StringUtil.isEmpty(itemName)
+                                            && StringUtil.isEmpty(value) && StringUtil.isEmpty(type)) {
+                                        continue;
+                                    }
 
-									if (count == 1 && mealName.equals("套餐名")) {
-										continue;
-									}
+                                    if (count == 1 && mealName.equals("套餐名")) {
+                                        continue;
+                                    }
 
-									if (StringUtil.isEmpty(mealName) || StringUtil.isEmpty(itemName)
-											|| StringUtil.isEmpty(value)|| StringUtil.isEmpty(type)) {
-										// throw new
-										// CommonException(CommonErrorCode.NOT_EXISTS,
-										// "第"+count+"行数据不规范,套餐名、项目名、结果三项必填;");
-										messages.add("第" + count + "行数据不规范,套餐名、项目名、结果、是否异常四项必填;");
-										continue;
-									}
-									LisExcelWrapperVO lisExcelWrapper = new LisExcelWrapperVO();
+                                    if (StringUtil.isEmpty(mealName) || StringUtil.isEmpty(itemName)
+                                            || StringUtil.isEmpty(value) || StringUtil.isEmpty(type)) {
+                                        // throw new
+                                        // CommonException(CommonErrorCode.NOT_EXISTS,
+                                        // "第"+count+"行数据不规范,套餐名、项目名、结果三项必填;");
+                                        messages.add("第" + count + "行数据不规范,套餐名、项目名、结果、是否异常四项必填;");
+                                        continue;
+                                    }
+                                    LisExcelWrapperVO lisExcelWrapper = new LisExcelWrapperVO();
 
-									lisExcelWrapper.setMealName(mealName);
-									lisExcelWrapper.setItemName(itemName);
-									lisExcelWrapper.setUnit(unit);
-									lisExcelWrapper.setValue(value);
-									lisExcelWrapper.setMax(max);
-									lisExcelWrapper.setMin(min);
-									lisExcelWrapper.setTime(time);
-									lisExcelWrapper.setType(type);
-									lisExcelWrapperList.add(lisExcelWrapper);
-								} catch (Exception e) {
-									e.printStackTrace();
-									throw new CommonException(CommonErrorCode.NOT_EXISTS, e.toString());
-									// logger.error("",e);
-								}
-							}
-						} else {
-							// throw new
-							// CommonException(CommonErrorCode.NOT_EXISTS,
-							// "非excel文件无法解析！");
-							messages.add("非excel文件无法解析！");
-						}
-					} else {
-						// throw new CommonException(CommonErrorCode.NOT_EXISTS,
-						// "未知文件无法解析！");
-						messages.add("未知文件无法解析！");
-					}
-				}
-			} else {
-				// throw new CommonException(CommonErrorCode.NOT_EXISTS,
-				// "无文件上传！");
-				messages.add("无文件上传！");
-			}
-			Map<String, List<LisExcelWrapperVO>> lixExMap = lisExcelWrapperList.stream()
-					.collect(Collectors.groupingBy(LisExcelWrapperVO::getMealName));
-			List<LisExcelResVO> LisExcelReslist = new ArrayList<LisExcelResVO>();
-			for (String str : lixExMap.keySet()) {
-				LisExcelResVO lisExcelResVO = new LisExcelResVO();
-				lisExcelResVO.setMenus(str);
-				lisExcelResVO.setLisExcelItem(lixExMap.get(str));
-				LisExcelReslist.add(lisExcelResVO);
-			}
+                                    lisExcelWrapper.setMealName(mealName);
+                                    lisExcelWrapper.setItemName(itemName);
+                                    lisExcelWrapper.setUnit(unit);
+                                    lisExcelWrapper.setValue(value);
+                                    lisExcelWrapper.setMax(max);
+                                    lisExcelWrapper.setMin(min);
+                                    lisExcelWrapper.setTime(time);
+                                    lisExcelWrapper.setType(type);
+                                    lisExcelWrapperList.add(lisExcelWrapper);
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                    throw new CommonException(CommonErrorCode.NOT_EXISTS, e.toString());
+                                    // logger.error("",e);
+                                }
+                            }
+                        } else {
+                            // throw new
+                            // CommonException(CommonErrorCode.NOT_EXISTS,
+                            // "非excel文件无法解析！");
+                            messages.add("非excel文件无法解析！");
+                        }
+                    } else {
+                        // throw new CommonException(CommonErrorCode.NOT_EXISTS,
+                        // "未知文件无法解析！");
+                        messages.add("未知文件无法解析！");
+                    }
+                }
+            } else {
+                // throw new CommonException(CommonErrorCode.NOT_EXISTS,
+                // "无文件上传！");
+                messages.add("无文件上传！");
+            }
+            Map<String, List<LisExcelWrapperVO>> lixExMap = lisExcelWrapperList.stream()
+                    .collect(Collectors.groupingBy(LisExcelWrapperVO::getMealName));
+            List<LisExcelResVO> LisExcelReslist = new ArrayList<LisExcelResVO>();
+            for (String str : lixExMap.keySet()) {
+                LisExcelResVO lisExcelResVO = new LisExcelResVO();
+                lisExcelResVO.setMenus(str);
+                lisExcelResVO.setLisExcelItem(lixExMap.get(str));
+                LisExcelReslist.add(lisExcelResVO);
+            }
 
-			LitAssayVO litAssay = new LitAssayVO();
-			litAssay.setMessages(messages);
-			litAssay.setLisExcelRes(LisExcelReslist);
-			return RespDTO.onSuc(litAssay);
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new CommonException(CommonErrorCode.NOT_EXISTS, "化验excel文件解析出错！");
-			// return response.failure("化验excel文件解析出错！");
-		} finally {
-			try {
-				if (inputStream != null) {
-					inputStream.close();
-				}
-				if (wb != null) {
-					wb.close();
-				}
-			} catch (Exception e) {
-			}
-		}
-	}
+            LitAssayVO litAssay = new LitAssayVO();
+            litAssay.setMessages(messages);
+            litAssay.setLisExcelRes(LisExcelReslist);
+            return RespDTO.onSuc(litAssay);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "化验excel文件解析出错！");
+            // return response.failure("化验excel文件解析出错！");
+        } finally {
+            try {
+                if (inputStream != null) {
+                    inputStream.close();
+                }
+                if (wb != null) {
+                    wb.close();
+                }
+            } catch (Exception e) {
+            }
+        }
+    }
 
-	private String getValue(Cell cell) {
-		try {
-			Object obj = null;
-			switch (cell.getCellTypeEnum()) {
-			case BOOLEAN:
-				obj = cell.getBooleanCellValue();
-				break;
-			case ERROR:
-				obj = cell.getErrorCellValue();
-				break;
-			case NUMERIC:
-				if (HSSFDateUtil.isCellDateFormatted(cell)) {
-					Date date = cell.getDateCellValue();
-					obj = DateFormatUtils.format(date, "yyyy-MM-dd");
-				} else {
-					obj = cell.getNumericCellValue();
-					DecimalFormat df = new DecimalFormat("0");
-					obj = df.format(obj);
-				}
+    private String getValue(Cell cell) {
+        try {
+            Object obj = null;
+            switch (cell.getCellTypeEnum()) {
+                case BOOLEAN:
+                    obj = cell.getBooleanCellValue();
+                    break;
+                case ERROR:
+                    obj = cell.getErrorCellValue();
+                    break;
+                case NUMERIC:
+                    if (HSSFDateUtil.isCellDateFormatted(cell)) {
+                        Date date = cell.getDateCellValue();
+                        obj = DateFormatUtils.format(date, "yyyy-MM-dd");
+                    } else {
+                        obj = cell.getNumericCellValue();
+                        DecimalFormat df = new DecimalFormat("0");
+                        obj = df.format(obj);
+                    }
 
-				// obj = cell.getNumericCellValue();
-				break;
-			case STRING:
-				obj = cell.getStringCellValue();
-				break;
-			default:
-				break;
-			}
-			return obj.toString();
-		} catch (Exception e) {
-			return "";
-		}
-	}
+                    // obj = cell.getNumericCellValue();
+                    break;
+                case STRING:
+                    obj = cell.getStringCellValue();
+                    break;
+                default:
+                    break;
+            }
+            return obj.toString();
+        } catch (Exception e) {
+            return "";
+        }
+    }
 
 }

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

@@ -18,6 +18,7 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
 
     /**
      * 根据moduleId，sexType，age获取模型
+     *
      * @param map
      * @return 模型数据
      */

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

@@ -52,13 +52,13 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
                 .map(artist -> artist.getId())
                 .collect(Collectors.toList());
         Map<Long, List<ModuleDetail>> moduleDetailMap = new LinkedHashMap<>();
-        if (ListUtil.isNotEmpty(ids)){
+        if (ListUtil.isNotEmpty(ids)) {
             Map<String, Object> paramMap = new HashMap<>();
             paramMap.put("ids", ids);
             paramMap.put("sexType", moduleVO.getSexType());
             paramMap.put("age", moduleVO.getAge());
             List<ModuleDetail> moduleDetailList = moduleDetailFacade.getDetailByModuleFac(paramMap);
-            if (ListUtil.isNotEmpty(moduleDetailList)){
+            if (ListUtil.isNotEmpty(moduleDetailList)) {
                 moduleDetailMap = EntityUtil.makeEntityListMap(moduleDetailList, "moduleId");
             }
 

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

@@ -1,15 +1,9 @@
 package com.diagbot.facade;
 
-import java.util.List;
-
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.entity.PatientInfo;
-import com.diagbot.enums.SexTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.PatientInfoServiceImpl;
@@ -17,6 +11,10 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 /**
  * @Description: 患者业务逻辑
@@ -28,42 +26,45 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
 
     /**
      * 获取患者信息
+     *
      * @param patientInfoVO
      * @return
      */
     public List<PatientInfoDTO> getPatientInfo(@RequestBody PatientInfoVO patientInfoVO) {
-        List<PatientInfoDTO> patientInfoDTOList = this.getPatientInfos(patientInfoVO.getPatientCode(),patientInfoVO.getHospitalCode());
-        if(ListUtil.isEmpty(patientInfoDTOList)){
+        List<PatientInfoDTO> patientInfoDTOList = this.getPatientInfos(patientInfoVO.getPatientCode(), patientInfoVO.getHospitalCode());
+        if (ListUtil.isEmpty(patientInfoDTOList)) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
                     "获取患者信息失败");
         }
         return patientInfoDTOList;
     }
-    
+
     /**
      * 页面顶部病人医生科室信息查询
+     *
      * @param getTopPatientInfoVO
      * @return
      */
     public GetTopPatientInfoDTO getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
-    	GetTopPatientInfoDTO getTopPatientInfoDTO = baseMapper.getTopPatientInfo(getTopPatientInfoVO);
-    	getTopPatientInfoDTO.setSystemTime(DateUtil.now());
-    	getTopPatientInfoDTO.setRecordId(getTopPatientInfoVO.getRecordId());
-    	return getTopPatientInfoDTO;
+        GetTopPatientInfoDTO getTopPatientInfoDTO = baseMapper.getTopPatientInfo(getTopPatientInfoVO);
+        getTopPatientInfoDTO.setSystemTime(DateUtil.now());
+        getTopPatientInfoDTO.setRecordId(getTopPatientInfoVO.getRecordId());
+        return getTopPatientInfoDTO;
     }
-    
+
     /**
      * 通过医院编码、病人编码获取病人信息
+     *
      * @param hospitalCode 医院编码
-     * @param patientCode 病人编码
+     * @param patientCode  病人编码
      * @return
      */
-    public PatientInfo getPatientByCode(String hospitalCode,String patientCode){
-    	QueryWrapper<PatientInfo> queryWrapper = new QueryWrapper<PatientInfo>();
-    	queryWrapper.eq("is_deleted", "N");
-    	queryWrapper.eq("hospital_code", hospitalCode);
-    	queryWrapper.eq("code", patientCode);
-    	return this.getOne(queryWrapper);
+    public PatientInfo getPatientByCode(String hospitalCode, String patientCode) {
+        QueryWrapper<PatientInfo> queryWrapper = new QueryWrapper<PatientInfo>();
+        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("hospital_code", hospitalCode);
+        queryWrapper.eq("code", patientCode);
+        return this.getOne(queryWrapper);
     }
-    
+
 }

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

@@ -1,43 +1,42 @@
 package com.diagbot.facade;
 
-import org.springframework.stereotype.Component;
-
 import com.diagbot.entity.PrintRecord;
 import com.diagbot.service.impl.PrintRecordServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.GsonUtil;
 import com.diagbot.vo.PrintRecordsVO;
+import org.springframework.stereotype.Component;
 
 /**
- * 
  * @author wangfeng
  * @Description: 打印记录
  * @date 2018年11月19日 上午10:04:42
  */
 @Component
-public class PrintRecordFacade extends PrintRecordServiceImpl{
+public class PrintRecordFacade extends PrintRecordServiceImpl {
+
+    /**
+     * 保存打印记录
+     *
+     * @param printRecordsVO
+     * @return boolean
+     */
+    public boolean savePrintRecord(PrintRecordsVO printRecordsVO) {
+        //获取传入的参数值，保存在数据表中
+        PrintRecord printRecord = new PrintRecord();
+        printRecord.setCreator(printRecordsVO.getDoctorId().toString());//创建人id
+        printRecord.setDoctorId(printRecordsVO.getDoctorId());//医生
+        printRecord.setGmtCreate(DateUtil.now());//创建时间
+        printRecord.setName(printRecordsVO.getName());//打印的名称
+        printRecord.setHospitalDeptId(printRecordsVO.getHospitalDeptId());//部门id
+        printRecord.setHospitalId(printRecordsVO.getHospitalId());//医院id
+        printRecord.setInquiryCode(printRecordsVO.getInquiryCode());//就诊号
+        printRecord.setPatientId(printRecordsVO.getPatientId());//患者id
+        printRecord.setContent(GsonUtil.toJson(printRecordsVO.getContent()));//文件展现
+        printRecord.setDataJson(printRecordsVO.getDataJson());//打印数据json
+        boolean res = save(printRecord);
+        return res;
+    }
 
-	/**
-	 * 保存打印记录
-	 * @param printRecordsVO
-	 * @return boolean
-	 */
-	public boolean savePrintRecord(PrintRecordsVO printRecordsVO) {
-		//获取传入的参数值，保存在数据表中
-		PrintRecord printRecord = new PrintRecord();
-		printRecord.setCreator(printRecordsVO.getDoctorId().toString());//创建人id
-		printRecord.setDoctorId(printRecordsVO.getDoctorId());//医生
-		printRecord.setGmtCreate(DateUtil.now());//创建时间
-		printRecord.setName(printRecordsVO.getName());//打印的名称
-		printRecord.setHospitalDeptId(printRecordsVO.getHospitalDeptId());//部门id
-		printRecord.setHospitalId(printRecordsVO.getHospitalId());//医院id
-		printRecord.setInquiryCode(printRecordsVO.getInquiryCode());//就诊号
-		printRecord.setPatientId(printRecordsVO.getPatientId());//患者id
-		printRecord.setContent(GsonUtil.toJson(printRecordsVO.getContent()));//文件展现
-		printRecord.setDataJson(printRecordsVO.getDataJson());//打印数据json
-		boolean res = save(printRecord);
-		return res;
-	}
 
-	
 }

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

@@ -96,7 +96,7 @@ public class PushFacade {
      * @param pushVO
      * @return
      */
-    public PushDTO pushInner(PushVO pushVO,Integer mode) {
+    public PushDTO pushInner(PushVO pushVO, Integer mode) {
         PushDTO pushDTO = new PushDTO();
         ResponseData data = pushAI(pushVO);
 
@@ -155,6 +155,7 @@ public class PushFacade {
 
     /**
      * 获取返回结果标签
+     *
      * @param map
      * @param pushVO
      * @param type

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

@@ -9,7 +9,6 @@ import com.diagbot.util.ListUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,7 +30,7 @@ public class QuestionDetailFacade extends QuestionDetailServiceImpl {
      */
     public List<QuestionDetail> getByQuestionId(Long questionId) {
         List<QuestionDetail> questionDetailList = new ArrayList<>();
-        if(questionId == null) {
+        if (questionId == null) {
             return questionDetailList;
         }
         QueryWrapper queryWrapper = new QueryWrapper();
@@ -50,15 +49,15 @@ public class QuestionDetailFacade extends QuestionDetailServiceImpl {
      */
     public Map<Long, List<QuestionDetail>> getByQuestionIds(List<Long> questionIds) {
         Map<Long, List<QuestionDetail>> map = new LinkedHashMap<>();
-        if(ListUtil.isEmpty(questionIds)) {
+        if (ListUtil.isEmpty(questionIds)) {
             return map;
         }
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         queryWrapper.in("question_id", questionIds);
         queryWrapper.orderByAsc("question_id", "order_no");
-        List<QuestionDetail>  questionDetailList = this.list(queryWrapper);
-        if (ListUtil.isNotEmpty(questionDetailList)){
+        List<QuestionDetail> questionDetailList = this.list(queryWrapper);
+        if (ListUtil.isNotEmpty(questionDetailList)) {
             map = EntityUtil.makeEntityListMap(questionDetailList, "questionId");
         }
         return map;

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

@@ -43,7 +43,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         paramMap.put("age", questionVO.getAge());
         paramMap.put("id", questionVO.getId());
         QuestionInfo questionInfo = this.getByParam(paramMap);
-        if(questionInfo == null) { //无数据直接返回，不通过报错的形式返回
+        if (questionInfo == null) { //无数据直接返回，不通过报错的形式返回
             return new QuestionDTO();
         }
         QuestionDTO res = new QuestionDTO();
@@ -58,11 +58,11 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         List<QuestionDTO> sonQuestionList = BeanUtil.listCopyTo(questionMapping, QuestionDTO.class);
         res.setQuestionMapping(sonQuestionList);
         //获取子标签的明细项
-        if(ListUtil.isNotEmpty(sonQuestionList)) {
+        if (ListUtil.isNotEmpty(sonQuestionList)) {
             Map paramMap1 = new HashMap<>();
             paramMap1.put("sexType", questionVO.getSexType());
             paramMap1.put("age", questionVO.getAge());
-            List<Long> sonQuestionIds  = sonQuestionList.stream()
+            List<Long> sonQuestionIds = sonQuestionList.stream()
                     .map(artist -> artist.getId())
                     .collect(Collectors.toList());
             Map<Long, List<QuestionDetail>> sonQuestionMap = questionDetailFacade.getByQuestionIds(sonQuestionIds);
@@ -70,26 +70,26 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
             //获取第二级子标签
             List<QuestionInfoWrapper> questionMapping1 = this.getByQuestionMapping(paramMap1);
             Map<Long, List<QuestionInfoWrapper>> qm1 = EntityUtil.makeEntityListMap(questionMapping1, "parentQuestion");
-            for(QuestionDTO bean : sonQuestionList) {
+            for (QuestionDTO bean : sonQuestionList) {
                 List<QuestionDetail> questionDetailList1 = sonQuestionMap.get(bean.getId());
-                if (ListUtil.isEmpty(questionDetailList1)){
+                if (ListUtil.isEmpty(questionDetailList1)) {
                     questionDetailList1 = new ArrayList<>();
                 }
                 bean.setQuestionDetailList(questionDetailList1);
                 List<QuestionDTO> sonQuestionList1 = new ArrayList<>();
-                if (ListUtil.isNotEmpty(qm1.get(bean.getId()))){
+                if (ListUtil.isNotEmpty(qm1.get(bean.getId()))) {
                     sonQuestionList1 = BeanUtil.listCopyTo(qm1.get(bean.getId()), QuestionDTO.class);
                 }
                 bean.setQuestionMapping(sonQuestionList1);
 
-                List<Long> sonQuestionIds1  = sonQuestionList1.stream()
+                List<Long> sonQuestionIds1 = sonQuestionList1.stream()
                         .map(artist -> artist.getId())
                         .collect(Collectors.toList());
                 Map<Long, List<QuestionDetail>> sonQuestionMap1 = questionDetailFacade.getByQuestionIds(sonQuestionIds1);
-                for(QuestionDTO questionDTO : sonQuestionList1) {
+                for (QuestionDTO questionDTO : sonQuestionList1) {
                     //获取二级子明细项
                     List<QuestionDetail> questionDetailList2 = sonQuestionMap1.get(questionDTO.getId());
-                    if (ListUtil.isEmpty(questionDetailList2)){
+                    if (ListUtil.isEmpty(questionDetailList2)) {
                         questionDetailList2 = new ArrayList<>();
                     }
                     questionDTO.setQuestionDetailList(questionDetailList2);
@@ -101,7 +101,6 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
     }
 
 
-
     /**
      * 查询多个id返回标签内容
      *
@@ -110,11 +109,11 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
      */
     public Map<Long, Object> getByIds(QuestionIdsVO questionIdsVO) {
         Map<Long, Object> data = new HashMap<>();
-        if(StringUtil.isEmpty(questionIdsVO.getIds())) {
+        if (StringUtil.isEmpty(questionIdsVO.getIds())) {
             return data;
         }
         String[] ids = questionIdsVO.getIds().split(",");
-        for(String id : ids) {
+        for (String id : ids) {
             QuestionVO questionVO = new QuestionVO();
             questionVO.setId(Long.parseLong(id));
             questionVO.setAge(questionIdsVO.getAge());

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

@@ -1,10 +1,7 @@
 package com.diagbot.facade;
 
 import com.diagbot.dto.QuestionUsualDTO;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.QuestionUsualServiceImpl;
-import com.diagbot.util.ListUtil;
 import com.diagbot.vo.QuestionUsualVO;
 import org.springframework.stereotype.Component;
 
@@ -27,10 +24,6 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
      */
     public List<QuestionUsualDTO> getQuestionUsual(QuestionUsualVO questionUsualVO) {
         List<QuestionUsualDTO> questionUsualDTOList = this.getQuestionUsualName(questionUsualVO);
-        if(ListUtil.isEmpty(questionUsualDTOList)){
-            throw new CommonException(CommonErrorCode.NOT_EXISTS,
-                    "获取标签信息失败");
-        }
-        return questionUsualDTOList ;
+        return questionUsualDTOList;
     }
 }

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

@@ -19,12 +19,13 @@ public class RetrievalFacade extends RetrievalServiceImpl {
 
     /**
      * 获取标签信息
+     *
      * @param retrievalVO
      * @return
      */
     public List<RetrievalDTO> getTagInfos(RetrievalVO retrievalVO) {
-        List<RetrievalDTO> data =new ArrayList<>();
-        if(StringUtil.isBlank(retrievalVO.getInputStr())){
+        List<RetrievalDTO> data = new ArrayList<>();
+        if (StringUtil.isBlank(retrievalVO.getInputStr())) {
             data = new ArrayList<>();
             return data;
         }

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

@@ -1,16 +1,8 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.TemplateInfoDTO;
-import com.diagbot.dto.VersionDetailDTO;
 import com.diagbot.entity.TemplateInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -23,6 +15,12 @@ import com.diagbot.vo.TemplateInfoRevampVO;
 import com.diagbot.vo.TemplateInfoVO;
 import com.diagbot.vo.TemplateInfosIdVO;
 import com.diagbot.vo.TemplateInfosVO;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author wangfeng
@@ -32,27 +30,27 @@ import com.diagbot.vo.TemplateInfosVO;
 @Component
 public class TemplateInfoFacade extends TemplateInfoServiceImpl {
 
-	/**
-	 * 
-	 * @param templateInfoVO
-	 * @return 医生病历模板信息
-	 */
-	public List<TemplateInfoDTO> findByDoctorIdTemplates(TemplateInfoVO templateInfoVO) {
+    /**
+     * @param templateInfoVO
+     * @return 医生病历模板信息
+     */
+    public List<TemplateInfoDTO> findByDoctorIdTemplates(TemplateInfoVO templateInfoVO) {
 		/*//根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据
 		TemplateInfo templateInfo = new TemplateInfo();
 		templateInfo.setDoctorId(templateInfoVO.getDoctorId());//医生id
 		templateInfo.setHospitalDeptId(templateInfoVO.getHospitalDeptId());//部门id
 		templateInfo.setHospitalId(templateInfoVO.getHospitalId());//医院id
 		List<TemplateInfoDTO> data = findByDoctorIdTemplate(templateInfo);*/
-		QueryWrapper<TemplateInfo> templateInfoQuery = new QueryWrapper<>();
-		Map<String, Object> mapAll = new HashMap<>();
-		mapAll.put("hospital_dept_id", templateInfoVO.getHospitalDeptId() );
-		mapAll.put("doctor_id",templateInfoVO.getDoctorId());
-		mapAll.put("hospital_id",templateInfoVO.getHospitalId());
-		mapAll.put("is_deleted",IsDeleteEnum.N.getKey());
-		templateInfoQuery.allEq(mapAll).orderByAsc("gmt_create");;
-		List<TemplateInfoDTO> data = new ArrayList<TemplateInfoDTO>();
-		List<TemplateInfo> datas = list(templateInfoQuery);
+        QueryWrapper<TemplateInfo> templateInfoQuery = new QueryWrapper<>();
+        Map<String, Object> mapAll = new HashMap<>();
+        mapAll.put("hospital_dept_id", templateInfoVO.getHospitalDeptId());
+        mapAll.put("doctor_id", templateInfoVO.getDoctorId());
+        mapAll.put("hospital_id", templateInfoVO.getHospitalId());
+        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+        templateInfoQuery.allEq(mapAll).orderByDesc("gmt_create");
+        ;
+        List<TemplateInfoDTO> data = new ArrayList<TemplateInfoDTO>();
+        List<TemplateInfo> datas = list(templateInfoQuery);
 		/*for(TemplateInfo templateInfo :datas){
 			TemplateInfoDTO templateInfoDTO =new TemplateInfoDTO();
 			templateInfoDTO.setId(templateInfo.getId());
@@ -69,116 +67,116 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
 			
 			data.add(templateInfoDTO);
 		}*/
-		data = BeanUtil.listCopyTo(datas, TemplateInfoDTO.class);
-		
-		return data;
-	}
+        data = BeanUtil.listCopyTo(datas, TemplateInfoDTO.class);
 
-	/**
-	 * 根据模板id 修改模板名
-	 * 
-	 * @param templateInfoRevampVO
-	 * @return
-	 */
-	public boolean updateByIdUsName(TemplateInfoRevampVO templateInfoRevampVO) {
-		//1.先判断数据是否存在有效
-		QueryWrapper<TemplateInfo> templateInfoFand = new QueryWrapper<>();
-		templateInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey())
-		                .eq("id", templateInfoRevampVO.getId());
-		TemplateInfo data = getOne(templateInfoFand);
-		if (data == null) {
-			throw new CommonException(CommonErrorCode.NOT_EXISTS, "该模板不存在");
-		}
-		//2.再判断该医生下模板名是否重复重在
-		QueryWrapper<TemplateInfo> templates = new QueryWrapper<>();
-		Map<String, Object> mapAll = new HashMap<>();
-		mapAll.put("hospital_dept_id", templateInfoRevampVO.getHospitalDeptId() );
-		mapAll.put("doctor_id",templateInfoRevampVO.getDoctorId());
-		mapAll.put("hospital_id",templateInfoRevampVO.getHospitalId());
-		mapAll.put("is_deleted",IsDeleteEnum.N.getKey());
-		mapAll.put("name",templateInfoRevampVO.getModeName());
-		templates.allEq(mapAll);
-		TemplateInfo datas = getOne(templates);
-		if (datas != null) {
-			throw new CommonException(CommonErrorCode.NOT_EXISTS, "该模板名已存在");
-		}
-		//3.修改表数据的模板名字
-		TemplateInfo templateInfo = new TemplateInfo();
-		templateInfo.setId(templateInfoRevampVO.getId());//模板id
-		templateInfo.setName(templateInfoRevampVO.getModeName());//模板名称
-		templateInfo.setGmtModified(DateUtil.now());//修改时间
-		boolean res = updateById(templateInfo);
-		if (!res) {
-			throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
-		}
-		
-		return res;
-	}
+        return data;
+    }
+
+    /**
+     * 根据模板id 修改模板名
+     *
+     * @param templateInfoRevampVO
+     * @return
+     */
+    public boolean updateByIdUsName(TemplateInfoRevampVO templateInfoRevampVO) {
+        //1.先判断数据是否存在有效
+        QueryWrapper<TemplateInfo> templateInfoFand = new QueryWrapper<>();
+        templateInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", templateInfoRevampVO.getId());
+        TemplateInfo data = getOne(templateInfoFand);
+        if (data == null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该模板不存在");
+        }
+        //2.再判断该医生下模板名是否重复重在
+        QueryWrapper<TemplateInfo> templates = new QueryWrapper<>();
+        Map<String, Object> mapAll = new HashMap<>();
+        mapAll.put("hospital_dept_id", templateInfoRevampVO.getHospitalDeptId());
+        mapAll.put("doctor_id", templateInfoRevampVO.getDoctorId());
+        mapAll.put("hospital_id", templateInfoRevampVO.getHospitalId());
+        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+        mapAll.put("name", templateInfoRevampVO.getModeName());
+        templates.allEq(mapAll);
+        TemplateInfo datas = getOne(templates);
+        if (datas != null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该模板名已存在");
+        }
+        //3.修改表数据的模板名字
+        TemplateInfo templateInfo = new TemplateInfo();
+        templateInfo.setId(templateInfoRevampVO.getId());//模板id
+        templateInfo.setName(templateInfoRevampVO.getModeName());//模板名称
+        templateInfo.setGmtModified(DateUtil.now());//修改时间
+        boolean res = updateById(templateInfo);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
 
-	/**
-	 * 保存模板
-	 * 
-	 * @param templateInfoRevampVO
-	 * @return
-	 */
-	public boolean saveTemplateInfo(TemplateInfosVO templateInfosVO) {
+        return res;
+    }
+
+    /**
+     * 保存模板
+     *
+     * @param templateInfoRevampVO
+     * @return
+     */
+    public boolean saveTemplateInfo(TemplateInfosVO templateInfosVO) {
         //1.判断该医生下是否存在模板名相同的数据
-		TemplateInfo templateInfo = new TemplateInfo();
-		QueryWrapper<TemplateInfo> templateInfoFand = new QueryWrapper<>();
-		Map<String, Object> mapAll = new HashMap<>();
-		mapAll.put("hospital_dept_id", templateInfosVO.getHospitalDeptId() );
-		mapAll.put("doctor_id",templateInfosVO.getDoctorId());
-		mapAll.put("hospital_id",templateInfosVO.getHospitalId());
-		mapAll.put("is_deleted",IsDeleteEnum.N.getKey());
-		mapAll.put("name",templateInfosVO.getModeName());
-		
-		templateInfoFand.allEq(mapAll);
-		TemplateInfo data = getOne(templateInfoFand);
-		if (data != null) {
-			throw new CommonException(CommonErrorCode.NOT_EXISTS, "该模板名存在");
-		}
-		//2.获取传入的数据，保存到数据表中。
-		templateInfo.setCreator(templateInfosVO.getDoctorId().toString());//创建人id
-		templateInfo.setDoctorId(templateInfosVO.getDoctorId());//医生id
-		templateInfo.setGmtCreate(DateUtil.now());//创建时间
-		templateInfo.setHospitalDeptId(templateInfosVO.getHospitalDeptId());//部门id
-		templateInfo.setHospitalId(templateInfosVO.getHospitalId());//医院id
-		templateInfo.setPreview(GsonUtil.toJson(templateInfosVO.getPreview()));//文本的展示
-		templateInfo.setDataJson(templateInfosVO.getDataJson());//页面json
-		templateInfo.setName(templateInfosVO.getModeName());//模板名称
-		templateInfo.setType(templateInfosVO.getModeType());//模板类型
-		boolean res = save(templateInfo);
-		if (!res) {
-			throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
-		}
-		
-		return res;
-	}
+        TemplateInfo templateInfo = new TemplateInfo();
+        QueryWrapper<TemplateInfo> templateInfoFand = new QueryWrapper<>();
+        Map<String, Object> mapAll = new HashMap<>();
+        mapAll.put("hospital_dept_id", templateInfosVO.getHospitalDeptId());
+        mapAll.put("doctor_id", templateInfosVO.getDoctorId());
+        mapAll.put("hospital_id", templateInfosVO.getHospitalId());
+        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+        mapAll.put("name", templateInfosVO.getModeName());
+
+        templateInfoFand.allEq(mapAll);
+        TemplateInfo data = getOne(templateInfoFand);
+        if (data != null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该模板名存在");
+        }
+        //2.获取传入的数据，保存到数据表中。
+        templateInfo.setCreator(templateInfosVO.getDoctorId().toString());//创建人id
+        templateInfo.setDoctorId(templateInfosVO.getDoctorId());//医生id
+        templateInfo.setGmtCreate(DateUtil.now());//创建时间
+        templateInfo.setHospitalDeptId(templateInfosVO.getHospitalDeptId());//部门id
+        templateInfo.setHospitalId(templateInfosVO.getHospitalId());//医院id
+        templateInfo.setPreview(GsonUtil.toJson(templateInfosVO.getPreview()));//文本的展示
+        templateInfo.setDataJson(templateInfosVO.getDataJson());//页面json
+        templateInfo.setName(templateInfosVO.getModeName());//模板名称
+        templateInfo.setType(templateInfosVO.getModeType());//模板类型
+        boolean res = save(templateInfo);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+
+        return res;
+    }
+
+    /**
+     * 根据模板id批量删除模板
+     *
+     * @param templateInfosIdVO
+     * @return
+     */
+    public boolean cancelTemplateInfo(TemplateInfosIdVO templateInfosIdVO) {
+        //1.获取传入的ids数据
+        String ids = templateInfosIdVO.getIds();
+        //2.截取到最后一个
+        String substring = ids.substring(0, ids.length());
+        //System.out.println(substring);
+        //3.以逗号分割
+        String[] splitIds = substring.split(",");
+        //把分割的id数据传入对象中，在表中批量删除
+        UpdateWrapper<TemplateInfo> templateInfoNew = new UpdateWrapper<>();
+        templateInfoNew.in("id", splitIds)
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                //.set("modifier",UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified", DateUtil.now());
+        boolean res = update(new TemplateInfo(), templateInfoNew);
 
-	/**
-	 * 根据模板id批量删除模板
-	 * 
-	 * @param templateInfosIdVO
-	 * @return
-	 */
-	public boolean cancelTemplateInfo(TemplateInfosIdVO templateInfosIdVO) {
-		//1.获取传入的ids数据
-		String ids = templateInfosIdVO.getIds();
-		//2.截取到最后一个
-		String substring = ids.substring(0, ids.length());
-		//System.out.println(substring);
-		//3.以逗号分割
-		String[] splitIds = substring.split(",");
-		//把分割的id数据传入对象中，在表中批量删除
-		UpdateWrapper<TemplateInfo> templateInfoNew = new UpdateWrapper<>();
-		templateInfoNew.in("id", splitIds)
-		               .eq("is_deleted", IsDeleteEnum.N.getKey())
-		               .set("is_deleted",IsDeleteEnum.Y.getKey())
-		               //.set("modifier",UserUtils.getCurrentPrincipleID())
-		               .set("gmt_modified",DateUtil.now());
-		boolean res = update(new TemplateInfo(), templateInfoNew);
-		
-		return res;
-	}
+        return res;
+    }
 
 }

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

@@ -21,12 +21,13 @@ public class TranFieldInfoFacade extends TranFieldInfoServiceImpl {
 
     /**
      * 根据uuid获取相关信息
+     *
      * @param info
      * @return
      */
-    public List<TranFieldInfoDTO> getInfoByUuid(TranFieldInfoVO info){
+    public List<TranFieldInfoDTO> getInfoByUuid(TranFieldInfoVO info) {
         List<TranFieldInfoDTO> tranFieldInfoDTOList = this.getInfosByUuid(info);
-        if(ListUtil.isEmpty(tranFieldInfoDTOList)){
+        if (ListUtil.isEmpty(tranFieldInfoDTOList)) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
                     "获取信息失败");
         }

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

@@ -33,9 +33,9 @@ public class VersionDetailFacaed extends VersionDetailServiceImpl {
     public List<VersionDetailDTO> getById(Long id) {
         QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
         Map<String, Object> mapAll = new HashMap<>();
-		mapAll.put("is_deleted",IsDeleteEnum.N.getKey());
-		mapAll.put("version_id",id);
-		mapAll.put("STATUS",StatusEnum.Enable.getKey());
+        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+        mapAll.put("version_id", id);
+        mapAll.put("STATUS", StatusEnum.Enable.getKey());
         versionDetailQuery.allEq(mapAll).orderByAsc("order_no");
 
         VersionDetail versionDetail = new VersionDetail();

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

@@ -1,10 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.VersionDetailDTO;
 import com.diagbot.dto.VersionWrapperDTO;
@@ -12,46 +7,50 @@ import com.diagbot.entity.VersionInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.service.impl.VersionInfoServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
- * 
  * @author wangfeng
  * @Description: 版本信息
  * @date 2018年11月21日 上午11:07:01
  */
 @Component
-public class VersionInfoFacade  extends VersionInfoServiceImpl{
-	
-	@Autowired
-	VersionDetailFacaed versionDetailFacaed;
-
-	
-	/**
-	 * 查询版本信息
-	 * @return
-	 */
-	public VersionWrapperDTO getVersionInfoAll() {
-		//查询最新的一条版本信息
-		QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
-		versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
-		                .eq("STATUS",StatusEnum.Enable.getKey())
-		                .orderByDesc("refresh_time");
-		
-		VersionInfo versionInfo = getOne(versionInfoQuery);
-		VersionWrapperDTO versionList= new  VersionWrapperDTO();
-		
-		if(versionInfo!=null){
-			//当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
-			long id = versionInfo.getId();
-			List<VersionDetailDTO> detail = versionDetailFacaed.getById(id);
-			//System.out.println(detail.toString());
-		    versionList.setId(versionInfo.getId());
-		    versionList.setName(versionInfo.getName());
-		    versionList.setRefreshTime(versionInfo.getRefreshTime());
-		    versionList.setStatus(versionInfo.getStatus());
-		    versionList.setDetail(detail);	
-		}
-		
-		return versionList;
-	}
+public class VersionInfoFacade extends VersionInfoServiceImpl {
+
+    @Autowired
+    VersionDetailFacaed versionDetailFacaed;
+
+
+    /**
+     * 查询版本信息
+     *
+     * @return
+     */
+    public VersionWrapperDTO getVersionInfoAll() {
+        //查询最新的一条版本信息
+        QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
+        versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("STATUS", StatusEnum.Enable.getKey())
+                .orderByDesc("refresh_time");
+
+        VersionInfo versionInfo = getOne(versionInfoQuery);
+        VersionWrapperDTO versionList = new VersionWrapperDTO();
+
+        if (versionInfo != null) {
+            //当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
+            long id = versionInfo.getId();
+            List<VersionDetailDTO> detail = versionDetailFacaed.getById(id);
+            //System.out.println(detail.toString());
+            versionList.setId(versionInfo.getId());
+            versionList.setName(versionInfo.getName());
+            versionList.setRefreshTime(versionInfo.getRefreshTime());
+            versionList.setStatus(versionInfo.getStatus());
+            versionList.setDetail(detail);
+        }
+
+        return versionList;
+    }
 }

icss-service/src/main/java/com/diagbot/service/BuriedSomeStatisticalService.java

@@ -1,11 +1,10 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.entity.BuriedSomeStatistical;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-
 /**
  * <p>
  * 数据埋点统计表 服务类
@@ -15,7 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2018-11-20
  */
 public interface BuriedSomeStatisticalService extends IService<BuriedSomeStatistical> {
-	
-	public boolean insertCodeBatch(List<BuriedSomeStatistical> reddemCode );
+
+    public boolean insertCodeBatch(List<BuriedSomeStatistical> reddemCode);
 
 }

icss-service/src/main/java/com/diagbot/service/DeptInfoService.java

@@ -17,10 +17,11 @@ import java.util.List;
 public interface DeptInfoService extends IService<DeptInfo> {
 
     /**
-     *  获取科室信息
+     * 获取科室信息
+     *
      * @param deptCode
      * @param hospitalCode
      * @return
      */
-    public List<DeptInfoDTO> getDeptInfos(String deptCode,String hospitalCode);
+    public List<DeptInfoDTO> getDeptInfos(String deptCode, String hospitalCode);
 }

icss-service/src/main/java/com/diagbot/service/DeptVitalService.java

@@ -1,7 +1,7 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.DeptVital;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.DeptVital;
 
 /**
  * <p>

icss-service/src/main/java/com/diagbot/service/DisclaimerInformationService.java

@@ -1,13 +1,11 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.entity.DisclaimerInformation;
-import com.diagbot.mapper.DisclaimerInformationMapper;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-
 /**
  * <p>
  * 免责申明详情 服务类
@@ -17,7 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2018-11-20
  */
 public interface DisclaimerInformationService extends IService<DisclaimerInformation> {
-	
-	public List<DisclaimerInformationDTO> getDisclaimerInformationAll();
+
+    public List<DisclaimerInformationDTO> getDisclaimerInformationAll();
 
 }

icss-service/src/main/java/com/diagbot/service/DoctorInfoService.java

@@ -18,7 +18,8 @@ public interface DoctorInfoService extends IService<DoctorInfo> {
 
 
     /**
-     *  获取医生信息
+     * 获取医生信息
+     *
      * @param doctorCode
      * @param hospitalCode
      * @param deptCode

icss-service/src/main/java/com/diagbot/service/DoctorPageModeService.java

@@ -1,7 +1,7 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.DoctorPageMode;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.DoctorPageMode;
 
 /**
  * <p>

icss-service/src/main/java/com/diagbot/service/HospitalDeptService.java

@@ -1,7 +1,7 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.HospitalDept;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.HospitalDept;
 
 /**
  * <p>

icss-service/src/main/java/com/diagbot/service/HospitalInfoService.java

@@ -19,6 +19,7 @@ public interface HospitalInfoService extends IService<HospitalInfo> {
 
     /**
      * 获取医院信息
+     *
      * @param hospitalInfoVO
      * @return
      */

icss-service/src/main/java/com/diagbot/service/InquiryDetailService.java

@@ -1,7 +1,7 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.InquiryDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.InquiryDetail;
 
 /**
  * <p>

icss-service/src/main/java/com/diagbot/service/InquiryInfoService.java

@@ -1,7 +1,7 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.InquiryInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.InquiryInfo;
 
 /**
  * <p>

icss-service/src/main/java/com/diagbot/service/IntroduceDetailService.java

@@ -1,7 +1,7 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.IntroduceDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.IntroduceDetail;
 
 /**
  * <p>

icss-service/src/main/java/com/diagbot/service/IntroduceInfoService.java

@@ -1,7 +1,7 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.IntroduceInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.IntroduceInfo;
 
 /**
  * <p>

icss-service/src/main/java/com/diagbot/service/IntroduceMapService.java

@@ -1,7 +1,7 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.IntroduceMap;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.IntroduceMap;
 
 /**
  * <p>

icss-service/src/main/java/com/diagbot/service/ModuleDetailService.java

@@ -19,6 +19,7 @@ public interface ModuleDetailService extends IService<ModuleDetail> {
 
     /**
      * 根据moduleId，sexType，age获取模型
+     *
      * @param map
      * @return 模型数据
      */

icss-service/src/main/java/com/diagbot/service/ModuleInfoService.java

@@ -1,7 +1,7 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.ModuleInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.ModuleInfo;
 
 /**
  * <p>

icss-service/src/main/java/com/diagbot/service/PrintRecordService.java

@@ -1,7 +1,7 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.PrintRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.PrintRecord;
 
 /**
  * <p>

icss-service/src/main/java/com/diagbot/service/QuestionDetailService.java

@@ -1,7 +1,7 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.QuestionDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.QuestionDetail;
 
 /**
  * <p>

icss-service/src/main/java/com/diagbot/service/QuestionInfoService.java

@@ -18,7 +18,8 @@ import java.util.Map;
 public interface QuestionInfoService extends IService<QuestionInfo> {
 
     /**
-     *  根据参数获取标签信息
+     * 根据参数获取标签信息
+     *
      * @param map 参数
      * @return
      */
@@ -26,7 +27,8 @@ public interface QuestionInfoService extends IService<QuestionInfo> {
 
 
     /**
-     *  根据questionMapping获取标签信息
+     * 根据questionMapping获取标签信息
+     *
      * @param map 参数
      * @return
      */
@@ -34,7 +36,8 @@ public interface QuestionInfoService extends IService<QuestionInfo> {
 
 
     /**
-     *  根据questionRelation获取标签信息
+     * 根据questionRelation获取标签信息
+     *
      * @param map 参数
      * @return
      */

icss-service/src/main/java/com/diagbot/service/QuestionMappingService.java

@@ -1,7 +1,7 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.QuestionMapping;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.QuestionMapping;
 
 /**
  * <p>

icss-service/src/main/java/com/diagbot/service/QuestionUsualService.java

@@ -19,6 +19,7 @@ public interface QuestionUsualService extends IService<QuestionUsual> {
 
     /**
      * 根据科室code获取常用标签
+     *
      * @return
      */
     public List<QuestionUsualDTO> getQuestionUsualName(QuestionUsualVO questionUsualVO);

icss-service/src/main/java/com/diagbot/service/RetrievalMappingService.java

@@ -1,7 +1,7 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.RetrievalMapping;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.RetrievalMapping;
 
 /**
  * <p>

icss-service/src/main/java/com/diagbot/service/RetrievalService.java

@@ -19,6 +19,7 @@ public interface RetrievalService extends IService<Retrieval> {
 
     /**
      * 获取主诉信息
+     *
      * @param retrievalVO
      * @return
      */

icss-service/src/main/java/com/diagbot/service/TemplateInfoService.java

@@ -1,12 +1,11 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.TemplateInfoDTO;
 import com.diagbot.entity.TemplateInfo;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-
 /**
  * <p>
  * 模板表 服务类
@@ -16,10 +15,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2018-11-16
  */
 public interface TemplateInfoService extends IService<TemplateInfo> {
-	
-	//根据医生id查询该医生保存的病历模板
-	public List<TemplateInfoDTO> findByDoctorIdTemplate(TemplateInfo templateInfo);
-	
-	public boolean updateById(TemplateInfo templateInfo);
+
+    //根据医生id查询该医生保存的病历模板
+    public List<TemplateInfoDTO> findByDoctorIdTemplate(TemplateInfo templateInfo);
+
+    public boolean updateById(TemplateInfo templateInfo);
 
 }

icss-service/src/main/java/com/diagbot/service/VersionDetailService.java

@@ -1,7 +1,7 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.VersionDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.VersionDetail;
 
 /**
  * <p>

icss-service/src/main/java/com/diagbot/service/VersionInfoService.java

@@ -1,7 +1,7 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.VersionInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.VersionInfo;
 
 /**
  * <p>

icss-service/src/main/java/com/diagbot/service/VitalOrderService.java

@@ -1,7 +1,7 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.VitalOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.VitalOrder;
 
 /**
  * <p>

icss-service/src/main/java/com/diagbot/service/impl/BuriedSomeStatisticalServiceImpl.java

@@ -1,14 +1,13 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.BuriedSomeStatistical;
 import com.diagbot.mapper.BuriedSomeStatisticalMapper;
 import com.diagbot.service.BuriedSomeStatisticalService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
-import org.springframework.stereotype.Service;
-
 /**
  * <p>
  * 数据埋点统计表 服务实现类
@@ -20,10 +19,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class BuriedSomeStatisticalServiceImpl extends ServiceImpl<BuriedSomeStatisticalMapper, BuriedSomeStatistical> implements BuriedSomeStatisticalService {
 
-	@Override
-	public boolean insertCodeBatch(List<BuriedSomeStatistical> reddemCode) {
-		// TODO Auto-generated method stub
-		return baseMapper.insertCodeBatch(reddemCode);
-	}
+    @Override
+    public boolean insertCodeBatch(List<BuriedSomeStatistical> reddemCode) {
+        // TODO Auto-generated method stub
+        return baseMapper.insertCodeBatch(reddemCode);
+    }
 
 }

icss-service/src/main/java/com/diagbot/service/impl/DeptInfoServiceImpl.java

@@ -1,10 +1,10 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.mapper.DeptInfoMapper;
 import com.diagbot.service.DeptInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -22,6 +22,6 @@ public class DeptInfoServiceImpl extends ServiceImpl<DeptInfoMapper, DeptInfo> i
 
     @Override
     public List<DeptInfoDTO> getDeptInfos(String deptCode, String hospitalCode) {
-        return baseMapper.getDeptInfos(deptCode,hospitalCode);
+        return baseMapper.getDeptInfos(deptCode, hospitalCode);
     }
 }

icss-service/src/main/java/com/diagbot/service/impl/DeptVitalServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.DeptVital;
 import com.diagbot.mapper.DeptVitalMapper;
 import com.diagbot.service.DeptVitalService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

icss-service/src/main/java/com/diagbot/service/impl/DisclaimerInformationServiceImpl.java

@@ -1,15 +1,14 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.entity.DisclaimerInformation;
 import com.diagbot.mapper.DisclaimerInformationMapper;
 import com.diagbot.service.DisclaimerInformationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
-import org.springframework.stereotype.Service;
-
 /**
  * <p>
  * 免责申明详情 服务实现类
@@ -21,11 +20,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class DisclaimerInformationServiceImpl extends ServiceImpl<DisclaimerInformationMapper, DisclaimerInformation> implements DisclaimerInformationService {
 
-	
-	@Override
-	public List<DisclaimerInformationDTO> getDisclaimerInformationAll() {
-		 
-		return baseMapper.getDisclaimerInformationAll();
-	}
+
+    @Override
+    public List<DisclaimerInformationDTO> getDisclaimerInformationAll() {
+
+        return baseMapper.getDisclaimerInformationAll();
+    }
 
 }

icss-service/src/main/java/com/diagbot/service/impl/DoctorInfoServiceImpl.java

@@ -1,10 +1,10 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.DoctorInfoDTO;
 import com.diagbot.entity.DoctorInfo;
 import com.diagbot.mapper.DoctorInfoMapper;
 import com.diagbot.service.DoctorInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -22,6 +22,6 @@ public class DoctorInfoServiceImpl extends ServiceImpl<DoctorInfoMapper, DoctorI
 
     @Override
     public List<DoctorInfoDTO> getDoctorInfos(String doctorCode, String hospitalCode, String deptCode) {
-        return baseMapper.getDoctorInfos(doctorCode,hospitalCode,deptCode);
+        return baseMapper.getDoctorInfos(doctorCode, hospitalCode, deptCode);
     }
 }

icss-service/src/main/java/com/diagbot/service/impl/DoctorPageModeServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.DoctorPageMode;
 import com.diagbot.mapper.DoctorPageModeMapper;
 import com.diagbot.service.DoctorPageModeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

icss-service/src/main/java/com/diagbot/service/impl/HospitalDeptServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.HospitalDept;
 import com.diagbot.mapper.HospitalDeptMapper;
 import com.diagbot.service.HospitalDeptService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

icss-service/src/main/java/com/diagbot/service/impl/InquiryDetailServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.InquiryDetail;
 import com.diagbot.mapper.InquiryDetailMapper;
 import com.diagbot.service.InquiryDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

icss-service/src/main/java/com/diagbot/service/impl/InquiryInfoServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.InquiryInfo;
 import com.diagbot.mapper.InquiryInfoMapper;
 import com.diagbot.service.InquiryInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

icss-service/src/main/java/com/diagbot/service/impl/IntroduceDetailServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.IntroduceDetail;
 import com.diagbot.mapper.IntroduceDetailMapper;
 import com.diagbot.service.IntroduceDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

icss-service/src/main/java/com/diagbot/service/impl/IntroduceInfoServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.IntroduceInfo;
 import com.diagbot.mapper.IntroduceInfoMapper;
 import com.diagbot.service.IntroduceInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

icss-service/src/main/java/com/diagbot/service/impl/IntroduceMapServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.IntroduceMap;
 import com.diagbot.mapper.IntroduceMapMapper;
 import com.diagbot.service.IntroduceMapService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

icss-service/src/main/java/com/diagbot/service/impl/ModuleDetailServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.ModuleDetail;
 import com.diagbot.mapper.ModuleDetailMapper;
 import com.diagbot.service.ModuleDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

icss-service/src/main/java/com/diagbot/service/impl/ModuleInfoServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.ModuleInfo;
 import com.diagbot.mapper.ModuleInfoMapper;
 import com.diagbot.service.ModuleInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

icss-service/src/main/java/com/diagbot/service/impl/PatientInfoServiceImpl.java

@@ -1,10 +1,10 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.entity.PatientInfo;
 import com.diagbot.mapper.PatientInfoMapper;
 import com.diagbot.service.PatientInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -22,6 +22,6 @@ public class PatientInfoServiceImpl extends ServiceImpl<PatientInfoMapper, Patie
 
     @Override
     public List<PatientInfoDTO> getPatientInfos(String patientCode, String hospitalCode) {
-        return baseMapper.getPatientInfos(patientCode,hospitalCode);
+        return baseMapper.getPatientInfos(patientCode, hospitalCode);
     }
 }

icss-service/src/main/java/com/diagbot/service/impl/PrintRecordServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.PrintRecord;
 import com.diagbot.mapper.PrintRecordMapper;
 import com.diagbot.service.PrintRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

icss-service/src/main/java/com/diagbot/service/impl/QuestionDetailServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.QuestionDetail;
 import com.diagbot.mapper.QuestionDetailMapper;
 import com.diagbot.service.QuestionDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

icss-service/src/main/java/com/diagbot/service/impl/QuestionMappingServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.QuestionMapping;
 import com.diagbot.mapper.QuestionMappingMapper;
 import com.diagbot.service.QuestionMappingService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

icss-service/src/main/java/com/diagbot/service/impl/QuestionUsualServiceImpl.java

@@ -1,10 +1,10 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.QuestionUsualDTO;
 import com.diagbot.entity.QuestionUsual;
 import com.diagbot.mapper.QuestionUsualMapper;
 import com.diagbot.service.QuestionUsualService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.vo.QuestionUsualVO;
 import org.springframework.stereotype.Service;
 

icss-service/src/main/java/com/diagbot/service/impl/RetrievalMappingServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.RetrievalMapping;
 import com.diagbot.mapper.RetrievalMappingMapper;
 import com.diagbot.service.RetrievalMappingService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

icss-service/src/main/java/com/diagbot/service/impl/RetrievalServiceImpl.java

@@ -1,10 +1,10 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.entity.Retrieval;
 import com.diagbot.mapper.RetrievalMapper;
 import com.diagbot.service.RetrievalService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.vo.RetrievalVO;
 import org.springframework.stereotype.Service;
 

icss-service/src/main/java/com/diagbot/service/impl/TemplateInfoServiceImpl.java

@@ -1,14 +1,13 @@
 package com.diagbot.service.impl;
 
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.TemplateInfoDTO;
 import com.diagbot.entity.TemplateInfo;
 import com.diagbot.mapper.TemplateInfoMapper;
 import com.diagbot.service.TemplateInfoService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * <p>
@@ -21,14 +20,14 @@ import com.diagbot.service.TemplateInfoService;
 @Service
 public class TemplateInfoServiceImpl extends ServiceImpl<TemplateInfoMapper, TemplateInfo> implements TemplateInfoService {
 
-	/**
-	 * 根据医生id查询该医生保存的病历模板
-	 */
-	@Override
-	public List<TemplateInfoDTO> findByDoctorIdTemplate(TemplateInfo templateInfo) {
-		
-		 return baseMapper.findByDoctorIdTemplate(templateInfo);
-	}
-	
-	
+    /**
+     * 根据医生id查询该医生保存的病历模板
+     */
+    @Override
+    public List<TemplateInfoDTO> findByDoctorIdTemplate(TemplateInfo templateInfo) {
+
+        return baseMapper.findByDoctorIdTemplate(templateInfo);
+    }
+
+
 }

icss-service/src/main/java/com/diagbot/service/impl/TranFieldInfoServiceImpl.java

@@ -1,10 +1,10 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.TranFieldInfoDTO;
 import com.diagbot.entity.TranFieldInfo;
 import com.diagbot.mapper.TranFieldInfoMapper;
 import com.diagbot.service.TranFieldInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.vo.TranFieldInfoVO;
 import org.springframework.stereotype.Service;
 

icss-service/src/main/java/com/diagbot/service/impl/VersionDetailServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.VersionDetail;
 import com.diagbot.mapper.VersionDetailMapper;
 import com.diagbot.service.VersionDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

icss-service/src/main/java/com/diagbot/service/impl/VersionInfoServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.VersionInfo;
 import com.diagbot.mapper.VersionInfoMapper;
 import com.diagbot.service.VersionInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

icss-service/src/main/java/com/diagbot/service/impl/VitalOrderServiceImpl.java

@@ -1,9 +1,9 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.VitalOrder;
 import com.diagbot.mapper.VitalOrderMapper;
 import com.diagbot.service.VitalOrderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.validation.Valid;
 
 /**
- * 
  * @author wangfeng
  * @Description: 数据埋点统计表 前端控制器
  * @date 2018年12月3日 上午9:24:22
@@ -26,18 +25,18 @@ import javax.validation.Valid;
 @Api(value = "数据埋点统计API[by:wangfeng]", tags = { "WF——数据埋点统计API" })
 @SuppressWarnings("unchecked")
 public class BuriedSomeStatisticalController {
-	@Autowired
-	MySender mySender;
+    @Autowired
+    MySender mySender;
 
-	@ApiOperation(value = "数据埋点统计保存[by:wangfeng]", notes = "数据埋点统计保存")
-	@PostMapping("/saveBuriedSomeStatisticals")
-	@SysLogger("saveBuriedSomeStatisticals")
-	@Transactional
-	public RespDTO<Boolean> saveBuriedSomeStatisticals(@Valid @RequestBody BuriedSomeStatisticalVO buriedSomeStatisticalVO) {
+    @ApiOperation(value = "数据埋点统计保存[by:wangfeng]", notes = "数据埋点统计保存")
+    @PostMapping("/saveBuriedSomeStatisticals")
+    @SysLogger("saveBuriedSomeStatisticals")
+    @Transactional
+    public RespDTO<Boolean> saveBuriedSomeStatisticals(@Valid @RequestBody BuriedSomeStatisticalVO buriedSomeStatisticalVO) {
 
-		mySender.outputPointSend(buriedSomeStatisticalVO);
+        mySender.outputPointSend(buriedSomeStatisticalVO);
 
-		return RespDTO.onSuc(true);
-	}
+        return RespDTO.onSuc(true);
+    }
 
 }

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

@@ -1,33 +1,23 @@
 package com.diagbot.web;
 
 
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.VersionWrapperDTO;
-import com.diagbot.entity.DisclaimerInformation;
-import com.diagbot.facade.DisclaimerInformationFacaed;
-
+import com.diagbot.facade.DisclaimerInformationFacade;
 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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-
 
 /**
- * 
  * @author wangfeng
- * @Description:  免责申明详情 前端控制器
+ * @Description: 免责申明详情 前端控制器
  * @date 2018年11月27日 下午3:35:57
  */
 @RestController
@@ -35,18 +25,17 @@ import org.springframework.transaction.annotation.Transactional;
 @Api(value = "免责申明详情API[by:wangfeng]", tags = { "WF——免责申明详情API" })
 @SuppressWarnings("unchecked")
 public class DisclaimerInformationController {
-	
-	@Autowired
-	DisclaimerInformationFacaed disclaimerInformationFacaed;
-
-	@ApiOperation(value = "获取免责申明详情[by:wangfeng]", notes = "获取免责申明详情")
-	@PostMapping("/getDisclaimerInformations")
-	@SysLogger("getDisclaimerInformations")
-	@Transactional
-	public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations() {
-
-		List<DisclaimerInformationDTO> data = disclaimerInformationFacaed.getDisclaimerInformation();
-		
-		return RespDTO.onSuc(data);
-	}
+
+    @Autowired
+    DisclaimerInformationFacade disclaimerInformationFacade;
+
+    @ApiOperation(value = "获取免责申明详情[by:wangfeng]", notes = "获取免责申明详情")
+    @PostMapping("/getDisclaimerInformations")
+    @SysLogger("getDisclaimerInformations")
+    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations() {
+
+        List<DisclaimerInformationDTO> data = disclaimerInformationFacade.getDisclaimerInformation();
+
+        return RespDTO.onSuc(data);
+    }
 }

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

@@ -20,14 +20,15 @@ import javax.validation.Valid;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author wangfeng
  * @since 2018-11-20
  */
+
 /**
- * 
+ *
  * @author wangfeng
  * @Description: 医生页面结构设置（文本和半结构） 前端控制器
  * @date 2018年11月20日 下午2:50:40
@@ -37,29 +38,28 @@ import javax.validation.Valid;
 @Api(value = "医生页面结构设置API[by:wangfeng]", tags = { "WF——医生页面结构设置API" })
 @SuppressWarnings("unchecked")
 public class DoctorPageModeController {
-	
-	@Autowired
-	DoctorPageModeFacade doctorPageModeFacade;
-	
-	@ApiOperation(value = "保存医生页面结构设置信息[by:wangfeng]",notes = "医生id : doctorId;</br>模式分类: modeClassify;</br> 模式值: modeValue;")
+
+    @Autowired
+    DoctorPageModeFacade doctorPageModeFacade;
+
+    @ApiOperation(value = "保存医生页面结构设置信息[by:wangfeng]", notes = "医生id : doctorId;</br>模式分类: modeClassify;</br> 模式值: modeValue;")
     @PostMapping("/saveDoctorPageModes")
     @SysLogger("saveDoctorPageModes")
     @Transactional
     public RespDTO<Boolean> saveDoctorPageModes(@Valid @RequestBody DoctorPageModeVO doctorPageModeVO) {
 
         boolean res = doctorPageModeFacade.saveDoctorPageMode(doctorPageModeVO);
-        
+
         return RespDTO.onSuc(res);
     }
 
-	@ApiOperation(value = "获取医生页面结构设置信息[by:wangfeng]",notes = "获取医生页面结构设置信息")
+    @ApiOperation(value = "获取医生页面结构设置信息[by:wangfeng]", notes = "获取医生页面结构设置信息")
     @PostMapping("/getDoctorPageModes")
     @SysLogger("getDoctorPageModes")
-    @Transactional
     public RespDTO<DoctorPageMode> getDoctorPageModes(@Valid @RequestBody DoctorIdVO doctorIdVO) {
 
-		DoctorPageMode doctorPageModeData = doctorPageModeFacade.getDoctorPageMode(doctorIdVO);
-        
+        DoctorPageMode doctorPageModeData = doctorPageModeFacade.getDoctorPageMode(doctorIdVO);
+
         return RespDTO.onSuc(doctorPageModeData);
     }
 }

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

@@ -37,6 +37,6 @@ public class HospitalInfoController {
     @SysLogger("getHospitalInfo")
     public RespDTO<HospitalInfoDTO> getHospitalInfo(@RequestBody @Valid HospitalInfoVO hospitalInfoVO) {
         List<HospitalInfoDTO> data = hospitalInfoFacade.getHospitalInfo(hospitalInfoVO);
-        return RespDTO.onSuc( data);
+        return RespDTO.onSuc(data);
     }
 }

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.GetInquiryDetailDTO;
 import com.diagbot.dto.HisInquiryDTO;
@@ -23,9 +12,17 @@ import com.diagbot.vo.GetInquiryDetailVO;
 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 javax.validation.Valid;
+import java.util.List;
 
 /**
  * @author rengb
@@ -47,28 +44,27 @@ public class InquiryInfoController {
     public RespDTO<SaveInquiryDTO> saveInquiry(@Valid @RequestBody SaveInquiryVO saveInquiryVO) {
         return RespDTO.onSuc(inquiryInfoFacade.saveInquiry(saveInquiryVO));
     }
-    
+
     @ApiOperation(value = "问诊记录回显[by:rengb]")
-	@PostMapping("/readInquiry")
-	@SysLogger("readInquiry")
-	public RespDTO<ReadInquiryDTO> readInquiry(@Valid @RequestBody ReadInquiryVO readInquiryVO) {
-		return RespDTO.onSuc(inquiryInfoFacade.readInquiry(readInquiryVO));
-	}
-    
+    @PostMapping("/readInquiry")
+    @SysLogger("readInquiry")
+    public RespDTO<ReadInquiryDTO> readInquiry(@Valid @RequestBody ReadInquiryVO readInquiryVO) {
+        return RespDTO.onSuc(inquiryInfoFacade.readInquiry(readInquiryVO));
+    }
+
     @ApiOperation(value = "历史病历列表[by:rengb]")
-   	@PostMapping("/hisInquirys")
-   	@SysLogger("hisInquirys")
-   	public RespDTO<List<HisInquiryDTO>> hisInquirys(@Valid @RequestBody HisInquirysVO hisInquirysVO) {
-   		return RespDTO.onSuc(inquiryInfoFacade.hisInquirys(hisInquirysVO));
-   	}
-    
+    @PostMapping("/hisInquirys")
+    @SysLogger("hisInquirys")
+    public RespDTO<List<HisInquiryDTO>> hisInquirys(@Valid @RequestBody HisInquirysVO hisInquirysVO) {
+        return RespDTO.onSuc(inquiryInfoFacade.hisInquirys(hisInquirysVO));
+    }
+
     @ApiOperation(value = "病历详情[by:rengb]")
-   	@PostMapping("/getInquiryDetail")
-   	@SysLogger("getInquiryDetail")
-   	public RespDTO<GetInquiryDetailDTO> getInquiryDetail(@Valid @RequestBody GetInquiryDetailVO getInquiryDetailVO) {
-   		return RespDTO.onSuc(inquiryInfoFacade.getInquiryDetail(getInquiryDetailVO));
-   	}
-    
-    
-    
+    @PostMapping("/getInquiryDetail")
+    @SysLogger("getInquiryDetail")
+    public RespDTO<GetInquiryDetailDTO> getInquiryDetail(@Valid @RequestBody GetInquiryDetailVO getInquiryDetailVO) {
+        return RespDTO.onSuc(inquiryInfoFacade.getInquiryDetail(getInquiryDetailVO));
+    }
+
+
 }

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

@@ -1,7 +1,10 @@
 package com.diagbot.web;
 
-import javax.servlet.http.HttpServletRequest;
-
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.LisExcelResFacade;
+import com.diagbot.vo.LitAssayVO;
+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.RequestMapping;
@@ -9,15 +12,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.LisExcelResFacade;
-import com.diagbot.vo.LitAssayVO;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletRequest;
 
 /**
- * 
  * @author wangfeng
  * @Description: 化验导入
  * @date 2018年11月28日 上午10:20:38
@@ -28,13 +25,13 @@ import io.swagger.annotations.ApiOperation;
 @SuppressWarnings("unchecked")
 public class LisExcelResController {
 
-	@Autowired
-	LisExcelResFacade lisExcelResFacade;
+    @Autowired
+    LisExcelResFacade lisExcelResFacade;
 
-	@ApiOperation(value = "导入化验数据:[by:wangfeng]", notes = "导入化验数据")
-	@PostMapping("/lisExcelAnalysis")
-	public RespDTO<LitAssayVO> lisExcelAnalysis(@RequestParam("uploadfile") MultipartFile file,
-			HttpServletRequest request) {
-		return lisExcelResFacade.lisExcelAnalysis(file, request);
-	}
+    @ApiOperation(value = "导入化验数据:[by:wangfeng]", notes = "导入化验数据")
+    @PostMapping("/lisExcelAnalysis")
+    public RespDTO<LitAssayVO> lisExcelAnalysis(@RequestParam("uploadfile") MultipartFile file,
+                                                HttpServletRequest request) {
+        return lisExcelResFacade.lisExcelAnalysis(file, request);
+    }
 }

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

@@ -44,17 +44,17 @@ public class PatientInfoController {
         List<PatientInfoDTO> data = patientInfoFacade.getPatientInfo(patientInfoVO);
         return RespDTO.onSuc(data);
     }
-    
-    
+
+
     @ApiOperation(value = "页面顶部病人医生科室信息——查询[by:rengb]",
             notes = "hospitalCode：医院编号，必填<br>" +
-            		"hospitalDeptCode：医院科室编号，必填<br>" +
-            		"doctorCode：医院医生编号，必填<br>" +
+                    "hospitalDeptCode：医院科室编号，必填<br>" +
+                    "doctorCode：医院医生编号，必填<br>" +
                     "patientCode:医院患者编号，必填<br>")
     @PostMapping("/getTopPatientInfo")
     @SysLogger("getTopPatientInfo")
     public RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@Valid @RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
         return RespDTO.onSuc(patientInfoFacade.getTopPatientInfo(getTopPatientInfoVO));
     }
-    
+
 }

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

@@ -1,9 +1,11 @@
 package com.diagbot.web;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.PrintRecordFacade;
+import com.diagbot.vo.PrintRecordsVO;
+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;
@@ -11,17 +13,9 @@ 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.RespDTO;
-import com.diagbot.facade.PrintRecordFacade;
-import com.diagbot.vo.ContentsVO;
-import com.diagbot.vo.PrintRecordsVO;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.validation.Valid;
 
 /**
- * 
  * @author wangfeng
  * @Description: 打印记录表 前端控制器
  * @date 2018年11月19日 上午10:03:12
@@ -32,20 +26,20 @@ import io.swagger.annotations.ApiOperation;
 @SuppressWarnings("unchecked")
 public class PrintRecordController {
 
-	@Autowired
-	PrintRecordFacade printRecordFacade;
+    @Autowired
+    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字符串(打印页面展示)")
-	@PostMapping("/savePrintRecords")
-	@SysLogger("savePrintRecords")
-	@Transactional
-	public RespDTO<Boolean> savePrintRecords(@Valid @RequestBody PrintRecordsVO printRecordsVO) {
+    @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字符串(打印页面展示)")
+    @PostMapping("/savePrintRecords")
+    @SysLogger("savePrintRecords")
+    @Transactional
+    public RespDTO<Boolean> savePrintRecords(@Valid @RequestBody PrintRecordsVO printRecordsVO) {
 
-		boolean res = printRecordFacade.savePrintRecord(printRecordsVO);
+        boolean res = printRecordFacade.savePrintRecord(printRecordsVO);
 
-		return RespDTO.onSuc(res);
-	}
+        return RespDTO.onSuc(res);
+    }
 
 }

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

@@ -37,11 +37,11 @@ public class QuestionUsualController {
     @ApiOperation(value = "常用标签——根据科室获取常用标签[by:wangyu]",
             notes = "deptCode：医院编码<br>" +
                     "age：年龄<br>" +
-                    "sexType: 性别<br>" )
+                    "sexType: 性别<br>")
     @PostMapping("/getQuestionUsual")
     @SysLogger("getQuestionUsual")
     public RespDTO<List<QuestionUsualDTO>> getQuestionUsual(@RequestBody @Valid QuestionUsualVO questionUsualVO) {
         List<QuestionUsualDTO> data = questionUsualFacade.getQuestionUsual(questionUsualVO);
-        return RespDTO.onSuc( data);
+        return RespDTO.onSuc(data);
     }
 }

icss-service/src/main/java/com/diagbot/web/TemplateInfoController.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.RespDTO;
 import com.diagbot.dto.TemplateInfoDTO;
@@ -21,14 +10,21 @@ import com.diagbot.vo.TemplateInfoRevampVO;
 import com.diagbot.vo.TemplateInfoVO;
 import com.diagbot.vo.TemplateInfosIdVO;
 import com.diagbot.vo.TemplateInfosVO;
-
 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 wangfeng
- * @Description:  病历模板表 前端控制器
+ * @Description: 病历模板表 前端控制器
  * @date 2018年11月16日 上午9:14:51
  */
 @RestController
@@ -36,56 +32,56 @@ import io.swagger.annotations.ApiOperation;
 @Api(value = "病历模板API[by:wangfeng]", tags = { "WF——病历模板API" })
 @SuppressWarnings("unchecked")
 public class TemplateInfoController {
-	
-	@Autowired
-	TemplateInfoFacade templateInfoFacade;
-	
+
+    @Autowired
+    TemplateInfoFacade templateInfoFacade;
+
     @ApiOperation(value = "根据医生id、医院id、部门id返回病历模板内容[by:wangfeng]",
-    		notes = "doctorId: 医生id<br>" +"dospitalId：医院编码<br>"+"deptId:部门id<br>")
+            notes = "doctorId: 医生id<br>" + "dospitalId：医院编码<br>" + "deptId:部门id<br>")
     @PostMapping("/getByDoctorIdTemplates")
     @SysLogger("getByDoctorIdTemplates")
     public RespDTO<TemplateInfo> getByDoctorIdTemplate(@Valid @RequestBody TemplateInfoVO templateInfoVO) {
 
         List<TemplateInfoDTO> data = templateInfoFacade.findByDoctorIdTemplates(templateInfoVO);
-        
+
         return RespDTO.onSuc(data);
     }
-   
+
     @ApiOperation(value = "根据模板id修改模板名称[by:wangfeng]", notes = "id;//模板</br>modeName;"
-			+ "//模板名</br>doctorId;//医生id</br>hospitalId;//医院id</br>hospitalDeptId;//部门id</br>")
-	@PostMapping("/updateByIdUsNames")
-	@SysLogger("updateByIdUsNames")
-	@Transactional
-    public RespDTO<Boolean> updateByIdUsNames(@Valid @RequestBody TemplateInfoRevampVO templateInfoRevampVO ){
-    	
-    	boolean res = templateInfoFacade.updateByIdUsName(templateInfoRevampVO);
-    	
-    	return RespDTO.onSuc(res);
+            + "//模板名</br>doctorId;//医生id</br>hospitalId;//医院id</br>hospitalDeptId;//部门id</br>")
+    @PostMapping("/updateByIdUsNames")
+    @SysLogger("updateByIdUsNames")
+    @Transactional
+    public RespDTO<Boolean> updateByIdUsNames(@Valid @RequestBody TemplateInfoRevampVO templateInfoRevampVO) {
+
+        boolean res = templateInfoFacade.updateByIdUsName(templateInfoRevampVO);
+
+        return RespDTO.onSuc(res);
     }
 
 
-    @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
-    public RespDTO<Boolean> saveTemplateInfo(@Valid @RequestBody TemplateInfosVO templateInfosVO){
-    	
+    public RespDTO<Boolean> saveTemplateInfo(@Valid @RequestBody TemplateInfosVO templateInfosVO) {
+
         boolean res = templateInfoFacade.saveTemplateInfo(templateInfosVO);
-    	
-    	return RespDTO.onSuc(res);
+
+        return RespDTO.onSuc(res);
     }
-    
-    @ApiOperation(value = "根据模板id批量删除病历模板[by:wangfeng]",notes = "ids: 模板ids<br>'ids':'1,2,3,4,5,6'")
+
+    @ApiOperation(value = "根据模板id批量删除病历模板[by:wangfeng]", notes = "ids: 模板ids<br>'ids':'1,2,3,4,5,6'")
     @PostMapping("/cancelTemplateInfos")
     @SysLogger("cancelTemplateInfos")
     @Transactional
-    public RespDTO<Boolean> cancelTemplateInfos(@Valid @RequestBody TemplateInfosIdVO templateInfosIdVO){
-    	
-		boolean res = templateInfoFacade.cancelTemplateInfo(templateInfosIdVO);
-    	
-    	return RespDTO.onSuc(res);
-    } 
-    
+    public RespDTO<Boolean> cancelTemplateInfos(@Valid @RequestBody TemplateInfosIdVO templateInfosIdVO) {
+
+        boolean res = templateInfoFacade.cancelTemplateInfo(templateInfosIdVO);
+
+        return RespDTO.onSuc(res);
+    }
+
 }

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

@@ -1,18 +1,15 @@
 package com.diagbot.web;
 
-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.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.facade.VersionInfoFacade;
-
 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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -28,18 +25,17 @@ import io.swagger.annotations.ApiOperation;
 @SuppressWarnings("unchecked")
 public class VersionInfoController {
 
-	@Autowired
-	VersionInfoFacade versionInfoFacade;
+    @Autowired
+    VersionInfoFacade versionInfoFacade;
 
-	@ApiOperation(value = "获取版本信息[by:wangfeng]", notes = "获取版本信息")
-	@PostMapping("/getVersionInfoAlls")
-	@SysLogger("getVersionInfoAlls")
-	@Transactional
-	public RespDTO<VersionWrapperDTO> getVersionInfoAlls() {
+    @ApiOperation(value = "获取版本信息[by:wangfeng]", notes = "获取版本信息")
+    @PostMapping("/getVersionInfoAlls")
+    @SysLogger("getVersionInfoAlls")
+    public RespDTO<VersionWrapperDTO> getVersionInfoAlls() {
 
-		VersionWrapperDTO data = versionInfoFacade.getVersionInfoAll();
+        VersionWrapperDTO data = versionInfoFacade.getVersionInfoAll();
 
-		return RespDTO.onSuc(data);
-	}
+        return RespDTO.onSuc(data);
+    }
 
 }

icssman-service/src/main/java/com/diagbot/dto/DisclaimerInformationDTO.java

@@ -56,7 +56,7 @@ public class DisclaimerInformationDTO {
     private String status;
 
     /**
-     * 免责申明编号
+     * 免责申明位置
      */
     private String disclaimerCode;
 

icssman-service/src/main/java/com/diagbot/dto/GetDeptInfoDTO.java

@@ -0,0 +1,20 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.DeptInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/12/14 15:24
+ */
+@Getter
+@Setter
+public class GetDeptInfoDTO extends DeptInfo {
+
+    /**
+     * 操作人姓名
+     */
+    private String userName;
+}

icssman-service/src/main/java/com/diagbot/dto/VitalInfoDTO.java

@@ -10,8 +10,6 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class VitalInfoDTO{
-    private String TagName;
-    private Long id;
+public class VitalInfoDTO extends QuestionShortDTO{
     private Integer orderNo;
 }

icssman-service/src/main/java/com/diagbot/dto/VitalOrderDTO.java

@@ -0,0 +1,22 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/12/14 14:32
+ */
+@Getter
+@Setter
+public class VitalOrderDTO {
+    private String operator;
+    private String operatorName;
+    private Date gmtOperate;
+    List<VitalInfoDTO> vitals;
+    List<QuestionShortDTO> unOrderedVitals;
+}

icssman-service/src/main/java/com/diagbot/entity/IntroduceDetail.java

@@ -76,9 +76,9 @@ public class IntroduceDetail implements Serializable {
     private Integer orderNo;
 
     /**
-     * 显示位置：0-都展示，1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示
+     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示
      */
-    private Integer position;
+    private String position;
 
     /**
      * 是否诊断依据（1-是，0-否）
@@ -173,11 +173,11 @@ public class IntroduceDetail implements Serializable {
         this.orderNo = orderNo;
     }
 
-    public Integer getPosition() {
+    public String getPosition() {
         return position;
     }
 
-    public void setPosition(Integer position) {
+    public void setPosition(String position) {
         this.position = position;
     }
 

icssman-service/src/main/java/com/diagbot/enums/IntroducePositionEnum.java

@@ -9,7 +9,6 @@ import lombok.Setter;
  * @time: 2018/11/23 10:12
  */
 public enum IntroducePositionEnum implements KeyedNamed {
-    All(0, "都展示"),
     Push(1, "推送展示"),
     More(2, "更多展示"),
     CommonTreatment(3, "一般治疗展示"),

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

@@ -2,7 +2,10 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.DeptInfoDTO;
+import com.diagbot.dto.GetDeptInfoDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -16,10 +19,13 @@ import com.diagbot.vo.AddDeptInfoVO;
 import com.diagbot.vo.GetDeptInfoDetialsVO;
 import com.diagbot.vo.GetDeptInfoVO;
 import com.diagbot.vo.UpdateDeptInfoVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -29,25 +35,32 @@ import java.util.List;
 @Component
 public class DeptInfoFacade extends DeptInfoServiceImpl {
 
+    @Autowired
+    private UserServiceClient userServiceClient;
+
     /**
      * 添加科室信息
+     *
      * @param addDeptInfoVO
      * @return
      */
     public Boolean addDeptInfo(AddDeptInfoVO addDeptInfoVO) {
+        //判断科室是否重名
         QueryWrapper<DeptInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
-        queryWrapper.eq("name",addDeptInfoVO.getName());
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        queryWrapper.eq("name", addDeptInfoVO.getName());
         List<DeptInfo> deptInfoList = this.list(queryWrapper);
-        if(ListUtil.isNotEmpty(deptInfoList)){
+        if (ListUtil.isNotEmpty(deptInfoList)) {
             throw new CommonException(CommonErrorCode.IS_EXISTS, "添加失败，科室已存在");
         }
+        //添加科室
         DeptInfo deptInfo = new DeptInfo();
-        BeanUtil.copyProperties(addDeptInfoVO,deptInfo);
+        BeanUtil.copyProperties(addDeptInfoVO, deptInfo);
         Date now = DateUtil.now();
         String userId = UserUtils.getCurrentPrincipleID();
         deptInfo.setCreator(userId);
         deptInfo.setGmtCreate(now);
+        deptInfo.setGmtModified(now);
         deptInfo.setModifier(userId);
         this.save(deptInfo);
         return true;
@@ -55,12 +68,13 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
 
     /**
      * 修改科室信息
+     *
      * @param updateDeptInfoVO
      * @return
      */
     public Boolean updateDeptInfo(UpdateDeptInfoVO updateDeptInfoVO) {
-        DeptInfo deptInfo =this.getById(updateDeptInfoVO.getId());
-        BeanUtil.copyProperties(updateDeptInfoVO,deptInfo);
+        DeptInfo deptInfo = this.getById(updateDeptInfoVO.getId());
+        BeanUtil.copyProperties(updateDeptInfoVO, deptInfo);
         deptInfo.setModifier(UserUtils.getCurrentPrincipleID());
         deptInfo.setGmtModified(DateUtil.now());
         this.updateById(deptInfo);
@@ -69,12 +83,13 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
 
     /**
      * 删除科室信息
+     *
      * @param updateDeptInfoVO
      * @return
      */
     public Boolean deleteDeptInfo(UpdateDeptInfoVO updateDeptInfoVO) {
-        DeptInfo deptInfo =new DeptInfo();
-        BeanUtil.copyProperties(updateDeptInfoVO,deptInfo);
+        DeptInfo deptInfo = new DeptInfo();
+        BeanUtil.copyProperties(updateDeptInfoVO, deptInfo);
         deptInfo.setModifier(UserUtils.getCurrentPrincipleID());
         deptInfo.setIsDeleted(IsDeleteEnum.Y.getKey());
         deptInfo.setGmtModified(DateUtil.now());
@@ -85,29 +100,46 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
 
     /**
      * 获取科室信息
+     *
      * @param getDeptInfoVO
      * @return
      */
-    public IPage<DeptInfo> getDeptInfo(GetDeptInfoVO getDeptInfoVO){
-        IPage iPage = this.getAllDeptInfo(getDeptInfoVO);
+    public IPage<GetDeptInfoDTO> getDeptInfo(GetDeptInfoVO getDeptInfoVO) {
+        IPage<GetDeptInfoDTO> iPage = this.getAllDeptInfo(getDeptInfoVO);
+        List<String> ids = new ArrayList<>();
+        for (GetDeptInfoDTO getDeptInfoDTO : iPage.getRecords()) {
+            ids.add(getDeptInfoDTO.getModifier());
+        }
+        //获取用户信息
+        RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
+        if (respDTO == null || !"0".equals(respDTO.code)) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR,
+                    "获取用户信息失败");
+        }
+        //将用户信息放入实体
+        for (GetDeptInfoDTO getDeptInfoDTO : iPage.getRecords()) {
+            getDeptInfoDTO.setUserName(respDTO.data.get(getDeptInfoDTO.getModifier()));
+        }
         return iPage;
     }
 
     /**
      * 常用标签维护获取科室名称
+     *
      * @return
      */
-    public List<DeptInfoDTO> getAllDeptInfo(){
+    public List<DeptInfoDTO> getAllDeptInfo() {
         List<DeptInfoDTO> deptInfoList = this.getDeptName();
         return deptInfoList;
     }
 
     /**
      * 科室维护详情
+     *
      * @param getDeptInfoDetialsVO
      * @return
      */
-    public DeptInfo getDeptInfoDetials(GetDeptInfoDetialsVO getDeptInfoDetialsVO){
+    public DeptInfo getDeptInfoDetials(GetDeptInfoDetialsVO getDeptInfoDetialsVO) {
         DeptInfo deptInfo = this.getById(getDeptInfoDetialsVO.getId());
         return deptInfo;
     }

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

@@ -1,14 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-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.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -27,9 +18,16 @@ import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DisclaimerInformationAllVO;
 import com.diagbot.vo.DisclaimerInformationIdVO;
 import com.diagbot.vo.DisclaimerInformationVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月21日 下午4:25:48
@@ -37,152 +35,151 @@ import com.diagbot.vo.DisclaimerInformationVO;
 @Component
 public class DisclaimerInformationFacaed extends DisclaimerInformationServiceImpl {
 
-	@Autowired
-	UserServiceClient userServiceClient;
-
-	/**
-	 * 
-	 * @return
-	 */
-	public List<DisclaimerInformationDTO> getDisclaimerInformation(Page page, String title) {
-
-		DisclaimerInformationAllVO disAll = new DisclaimerInformationAllVO();
-		disAll.setTitle(title);
-		IPage<DisclaimerInformationDTO> querDisclaimerInformation = getDisclaimerInformationAll(page, disAll);
-		List<DisclaimerInformationDTO> data = querDisclaimerInformation.getRecords();
-		
-		List<String> modifierid = new ArrayList<>();
-		modifierid = data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
-		
-		Map<String, String> userNames = new HashMap<>();
-		if(modifierid.size()>0){
-			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);	
-			 if (userNamesDTO == null || !"0".equals(userNamesDTO.code)) {
-	                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-	                        "获取所有用户信息失败");
-	            }
-			userNames = userNamesDTO.data;
-		}
-		
-		
-		List<DisclaimerInformationDTO> dataNew = new ArrayList<DisclaimerInformationDTO>();
-		for (DisclaimerInformationDTO disclaimerInformationDTO : data) {
-			DisclaimerInformationDTO dis = new DisclaimerInformationDTO();
-			dis.setId(disclaimerInformationDTO.getId());
-			dis.setDescription(disclaimerInformationDTO.getDescription());
-			dis.setDisclaimerCode(disclaimerInformationDTO.getDisclaimerCode());
-			dis.setGmtCreate(disclaimerInformationDTO.getGmtCreate());
-			dis.setModifier(userNames.get(disclaimerInformationDTO.getModifier()));
-			dis.setOrderNo(disclaimerInformationDTO.getOrderNo());
-			dis.setRemark(disclaimerInformationDTO.getRemark());
-			dis.setStatus(disclaimerInformationDTO.getStatus());
-			dis.setTitle(disclaimerInformationDTO.getTitle());
-			//dis.setVersionId(disclaimerInformationDTO.getVersionId());
-
-			dataNew.add(dis);
-		}
-		return dataNew;
-	}
-
-	/**
-	 * 增加
-	 * 
-	 * @return
-	 */
-	public Boolean addDisclaimerInformation(DisclaimerInformationVO disclaimerInformationVO) {
-		DisclaimerInformation disclaimerInformation = new DisclaimerInformation();
-		disclaimerInformation.setCreator(UserUtils.getCurrentPrincipleID());
-		disclaimerInformation.setModifier(UserUtils.getCurrentPrincipleID());
-		disclaimerInformation.setDescription(disclaimerInformationVO.getDescription());
-		disclaimerInformation.setDisclaimerCode(disclaimerInformationVO.getDisclaimerCode());
-		disclaimerInformation.setGmtCreate(DateUtil.now());
-		disclaimerInformation.setGmtModified(DateUtil.now());
-		disclaimerInformation.setOrderNo(disclaimerInformationVO.getOrderNo());
-		disclaimerInformation.setRemark(disclaimerInformationVO.getRemark());
-		disclaimerInformation.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
-		disclaimerInformation.setTitle(disclaimerInformationVO.getTitle());
-		//disclaimerInformation.setVersionId();
-
-		boolean res = save(disclaimerInformation);
-
-		return res;
-	}
-
-	/**
-	 * 修改
-	 * 
-	 * @return
-	 */
-	public Boolean updateDisclaimerInformation(DisclaimerInformationAllVO disclaimerInformationAllVO) {
-		// 1.先判断数据是否存在有效
-		QueryWrapper<DisclaimerInformation> disclaimerInformationFand = new QueryWrapper<>();
-		disclaimerInformationFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id",
-				disclaimerInformationAllVO.getId());
-		DisclaimerInformation data = getOne(disclaimerInformationFand);
-		if (data == null) {
-			throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
-		}
-		// 2.修改版本详情信息
-		DisclaimerInformation disclaimerInformation = new DisclaimerInformation();
-
-		disclaimerInformation.setGmtModified(DateUtil.now());// 修改时间
-		disclaimerInformation.setModifier(UserUtils.getCurrentPrincipleID());
-		disclaimerInformation.setDescription(disclaimerInformationAllVO.getDescription());
-		disclaimerInformation.setDisclaimerCode(disclaimerInformationAllVO.getDisclaimerCode());
-		disclaimerInformation.setGmtCreate(DateUtil.now());
-		disclaimerInformation.setId(disclaimerInformationAllVO.getId());
-		disclaimerInformation.setOrderNo(disclaimerInformationAllVO.getOrderNo());
-		disclaimerInformation.setRemark(disclaimerInformationAllVO.getRemark());
-		disclaimerInformation.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
-		disclaimerInformation.setTitle(disclaimerInformationAllVO.getTitle());
-		disclaimerInformation.setVersionId(0L);
-
-		boolean res = updateById(disclaimerInformation);
-
-		if (!res) {
-			throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
-		}
-
-		return res;
-	}
-
-	/**
-	 * 删除
-	 * 
-	 * @return
-	 */
-	public Boolean cancelDisclaimerInformation(DisclaimerInformationIdVO disclaimerInformationIdVO) {
-		UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
-		disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
-				.set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
-				.set("gmt_modified", DateUtil.now());
-		return update(new DisclaimerInformation(), disclaimerInformationNew);
-	}
-
-	/**
-	 * 启用
-	 * 
-	 * @return
-	 */
-	public boolean startDisclaimerInformations(DisclaimerInformationIdVO disclaimerInformationIdVO) {
-		UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
-		disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
-				.eq("status", StatusEnum.Disable.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
-				.set("gmt_modified", DateUtil.now()).set("status", StatusEnum.Enable.getKey());
-		return update(new DisclaimerInformation(), disclaimerInformationNew);
-	}
-
-	/**
-	 * 停用
-	 * 
-	 * @return
-	 */
-	public boolean endDisclaimerInformations(DisclaimerInformationIdVO disclaimerInformationIdVO) {
-		UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
-		disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
-				.eq("status", StatusEnum.Enable.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
-				.set("gmt_modified", DateUtil.now()).set("status", StatusEnum.Disable.getKey());
-		return update(new DisclaimerInformation(), disclaimerInformationNew);
-	}
+    @Autowired
+    UserServiceClient userServiceClient;
+
+    /**
+     * @return
+     */
+    public List<DisclaimerInformationDTO> getDisclaimerInformation(Page page, String title) {
+
+        DisclaimerInformationAllVO disAll = new DisclaimerInformationAllVO();
+        disAll.setTitle(title);
+        IPage<DisclaimerInformationDTO> querDisclaimerInformation = getDisclaimerInformationAll(page, disAll);
+        List<DisclaimerInformationDTO> data = querDisclaimerInformation.getRecords();
+
+        List<String> modifierid = new ArrayList<>();
+        modifierid = data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
+
+        Map<String, String> userNames = new HashMap<>();
+        if (modifierid.size() > 0) {
+            RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+            if (userNamesDTO == null || !"0".equals(userNamesDTO.code)) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                        "获取所有用户信息失败");
+            }
+            userNames = userNamesDTO.data;
+        }
+
+
+        List<DisclaimerInformationDTO> dataNew = new ArrayList<DisclaimerInformationDTO>();
+        for (DisclaimerInformationDTO disclaimerInformationDTO : data) {
+            DisclaimerInformationDTO dis = new DisclaimerInformationDTO();
+            dis.setId(disclaimerInformationDTO.getId());
+            dis.setDescription(disclaimerInformationDTO.getDescription());
+            dis.setDisclaimerCode(disclaimerInformationDTO.getDisclaimerCode());
+            dis.setGmtCreate(disclaimerInformationDTO.getGmtCreate());
+            dis.setModifier(userNames.get(disclaimerInformationDTO.getModifier()));
+            dis.setOrderNo(disclaimerInformationDTO.getOrderNo());
+            dis.setRemark(disclaimerInformationDTO.getRemark());
+            dis.setStatus(disclaimerInformationDTO.getStatus());
+            dis.setTitle(disclaimerInformationDTO.getTitle());
+            //dis.setVersionId(disclaimerInformationDTO.getVersionId());
+
+            dataNew.add(dis);
+        }
+        return dataNew;
+    }
+
+    /**
+     * 增加
+     *
+     * @return
+     */
+    public Boolean addDisclaimerInformation(DisclaimerInformationVO disclaimerInformationVO) {
+        DisclaimerInformation disclaimerInformation = new DisclaimerInformation();
+        disclaimerInformation.setCreator(UserUtils.getCurrentPrincipleID());
+        disclaimerInformation.setModifier(UserUtils.getCurrentPrincipleID());
+        disclaimerInformation.setDescription(disclaimerInformationVO.getDescription());
+        disclaimerInformation.setDisclaimerCode(disclaimerInformationVO.getDisclaimerCode());
+        disclaimerInformation.setGmtCreate(DateUtil.now());
+        disclaimerInformation.setGmtModified(DateUtil.now());
+        disclaimerInformation.setOrderNo(disclaimerInformationVO.getOrderNo());
+        disclaimerInformation.setRemark(disclaimerInformationVO.getRemark());
+        disclaimerInformation.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+        disclaimerInformation.setTitle(disclaimerInformationVO.getTitle());
+        //disclaimerInformation.setVersionId();
+
+        boolean res = save(disclaimerInformation);
+
+        return res;
+    }
+
+    /**
+     * 修改
+     *
+     * @return
+     */
+    public Boolean updateDisclaimerInformation(DisclaimerInformationAllVO disclaimerInformationAllVO) {
+        // 1.先判断数据是否存在有效
+        QueryWrapper<DisclaimerInformation> disclaimerInformationFand = new QueryWrapper<>();
+        disclaimerInformationFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id",
+                disclaimerInformationAllVO.getId());
+        DisclaimerInformation data = getOne(disclaimerInformationFand);
+        if (data == null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+        }
+        // 2.修改版本详情信息
+        DisclaimerInformation disclaimerInformation = new DisclaimerInformation();
+
+        disclaimerInformation.setGmtModified(DateUtil.now());// 修改时间
+        disclaimerInformation.setModifier(UserUtils.getCurrentPrincipleID());
+        disclaimerInformation.setDescription(disclaimerInformationAllVO.getDescription());
+        disclaimerInformation.setDisclaimerCode(disclaimerInformationAllVO.getDisclaimerCode());
+        disclaimerInformation.setGmtCreate(DateUtil.now());
+        disclaimerInformation.setId(disclaimerInformationAllVO.getId());
+        disclaimerInformation.setOrderNo(disclaimerInformationAllVO.getOrderNo());
+        disclaimerInformation.setRemark(disclaimerInformationAllVO.getRemark());
+        disclaimerInformation.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+        disclaimerInformation.setTitle(disclaimerInformationAllVO.getTitle());
+        disclaimerInformation.setVersionId(0L);
+
+        boolean res = updateById(disclaimerInformation);
+
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
+
+        return res;
+    }
+
+    /**
+     * 删除
+     *
+     * @return
+     */
+    public Boolean cancelDisclaimerInformation(DisclaimerInformationIdVO disclaimerInformationIdVO) {
+        UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
+        disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+                .set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified", DateUtil.now());
+        return update(new DisclaimerInformation(), disclaimerInformationNew);
+    }
+
+    /**
+     * 启用
+     *
+     * @return
+     */
+    public boolean startDisclaimerInformations(DisclaimerInformationIdVO disclaimerInformationIdVO) {
+        UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
+        disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("status", StatusEnum.Disable.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified", DateUtil.now()).set("status", StatusEnum.Enable.getKey());
+        return update(new DisclaimerInformation(), disclaimerInformationNew);
+    }
+
+    /**
+     * 停用
+     *
+     * @return
+     */
+    public boolean endDisclaimerInformations(DisclaimerInformationIdVO disclaimerInformationIdVO) {
+        UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
+        disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("status", StatusEnum.Enable.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified", DateUtil.now()).set("status", StatusEnum.Disable.getKey());
+        return update(new DisclaimerInformation(), disclaimerInformationNew);
+    }
 
 }

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

@@ -1,6 +1,6 @@
 package com.diagbot.facade;
 
-import com.diagbot.service.impl.EnumsDataService;
+import com.diagbot.service.EnumsDataService;
 import com.diagbot.util.EnumEntriesBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -24,7 +24,6 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
     }
 
 
-
     /**
      * 根据moduleId删除明细
      *

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

@@ -31,7 +31,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
      * @return
      */
     public Boolean deleteByIdsFac(String ids) {
-        if(StringUtil.isEmpty(ids)) {
+        if (StringUtil.isEmpty(ids)) {
             return true;
         }
         Map paramMap = new HashMap<>();