代码整理

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

@@ -1,26 +1,5 @@
 package com.diagbot.facade;
 
-import java.io.IOException;
-import java.net.URLEncoder;
-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 javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-
-import com.diagbot.util.IntegerUtil;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -58,6 +37,7 @@ import com.diagbot.service.InquiryScaleService;
 import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.IntegerUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.StringUtil;
@@ -75,6 +55,24 @@ import com.diagbot.vo.PatientInfoVO;
 import com.diagbot.vo.ReadInquiryVO;
 import com.diagbot.vo.SaveInquiryToHisVO;
 import com.diagbot.vo.SaveInquiryVO;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+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;
 
 /**
  * @author rengb
@@ -134,8 +132,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         InquiryInfo inquiryInfo = getOne(inquiryInfoQe, false);
 
         if (inquiryInfo == null) {
-        	inquiryInfo = new InquiryInfo();
-        	inquiryInfo.setGmtCreate(now);
+            inquiryInfo = new InquiryInfo();
+            inquiryInfo.setGmtCreate(now);
         } else {
             inquiryDetailFacade.removeByInquiryId(inquiryInfo.getId());
             inquiryDrugFacade.removeByInquiryId(inquiryInfo.getId());
@@ -148,9 +146,10 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
         Long inquiryId = inquiryInfo.getId();
         if (ListUtil.isNotEmpty(saveInquiryVO.getDetailList())) {
-            List<InquiryDetail> inquiryDetailList = BeanUtil.listCopyTo(saveInquiryVO.getDetailList(), InquiryDetail.class);
-            inquiryDetailList.forEach(i->{
-            	i.setInquiryId(inquiryId);
+            List<InquiryDetail> inquiryDetailList = BeanUtil.listCopyTo(saveInquiryVO.getDetailList(),
+                    InquiryDetail.class);
+            inquiryDetailList.forEach(i -> {
+                i.setInquiryId(inquiryId);
                 i.setGmtCreate(now);
                 i.setGmtModified(now);
             });
@@ -176,7 +175,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             inquiryEvaluationFacade.save(inquiryEvaluation);
 
             if (ListUtil.isNotEmpty(saveInquiryVO.getInquiryEvaluation().getScaleList())) {
-                List<InquiryScale> inquiryScaleList = BeanUtil.listCopyTo(saveInquiryVO.getInquiryEvaluation().getScaleList(), InquiryScale.class);
+                List<InquiryScale> inquiryScaleList = BeanUtil.listCopyTo(
+                        saveInquiryVO.getInquiryEvaluation().getScaleList(), InquiryScale.class);
                 inquiryScaleList.forEach(i -> {
                     i.setInquiryId(inquiryId);
                     i.setInquiryEvaluationId(inquiryEvaluation.getId());
@@ -199,7 +199,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         RespDTOUtil.respNGDeal(tranServiceClient.saveInquiryToHis(saveInquiryToHisVO), "问诊记录插入tran层失败");
 
         saveInquiryDTO.setInquiryId(inquiryId);
-        
+
         return saveInquiryDTO;
     }
 
@@ -226,7 +226,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
             QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
             inquiryDetailQe.eq("inquiry_id", inquiryInfo.getId());
-            readInquiryDTO.setDetailList(inquiryDetailFacade.list(inquiryDetailQe).stream().sorted((a, b) -> a.getType() - b.getType()).collect(Collectors.toList()));
+            readInquiryDTO.setDetailList(inquiryDetailFacade.list(inquiryDetailQe).stream()
+                    .sorted((a, b) -> a.getType() - b.getType()).collect(Collectors.toList()));
 
             List<InquiryDrug> inquiryDrugList = inquiryDrugFacade.getInquiryDrugs(inquiryInfo.getId());
 
@@ -264,7 +265,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         Map<String, Object> map = new HashMap<>();
         map.put("hospitalId", hospitalInfoDTO.getId());
         map.put("patientId", patientInfoDTO.getId());
-        if (!IntegerUtil.isNull(getLastOtherVO.getSign())){
+        if (!IntegerUtil.isNull(getLastOtherVO.getSign())) {
             map.put("sign", getLastOtherVO.getSign());
         }
         InquiryInfo inquiryInfo = baseMapper.getPatientLast(map);
@@ -290,21 +291,28 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      * @return
      */
     public IPage<HisInquiryDTO> hisInquirys(HisInquirysVO hisInquirysVO) {
-    	Page<HisInquiryDTO> hisInquiryDTOPage = new Page<>();
-    	
+        Page<HisInquiryDTO> hisInquiryDTOPage = new Page<>();
+
         QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<>();
         inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
         inquiryInfoQe.eq("hospital_id", hisInquirysVO.getHospitalId());
-        inquiryInfoQe.eq(hisInquirysVO.getHospitalDeptId() != null, "hospital_dept_id", hisInquirysVO.getHospitalDeptId());
-        inquiryInfoQe.eq(hisInquirysVO.getDoctorId() != null, "doctor_id", hisInquirysVO.getDoctorId());
-        inquiryInfoQe.eq(hisInquirysVO.getPatientId() != null, "patient_id", hisInquirysVO.getPatientId());
-        inquiryInfoQe.eq(hisInquirysVO.getType() != null, "type", hisInquirysVO.getType());
-        inquiryInfoQe.eq(hisInquirysVO.getSign() != null, "sign", hisInquirysVO.getSign());
-        inquiryInfoQe.ge(hisInquirysVO.getStartDate() != null, "gmt_create", hisInquirysVO.getStartDate());
-        inquiryInfoQe.le(hisInquirysVO.getEndDate() != null, "gmt_create", hisInquirysVO.getEndDate());
-        inquiryInfoQe.orderByDesc(hisInquirysVO.getOrderType() == 1,"gmt_modified");
+        inquiryInfoQe.eq(hisInquirysVO.getHospitalDeptId() != null,
+                "hospital_dept_id", hisInquirysVO.getHospitalDeptId());
+        inquiryInfoQe.eq(hisInquirysVO.getDoctorId() != null,
+                "doctor_id", hisInquirysVO.getDoctorId());
+        inquiryInfoQe.eq(hisInquirysVO.getPatientId() != null,
+                "patient_id", hisInquirysVO.getPatientId());
+        inquiryInfoQe.eq(hisInquirysVO.getType() != null,
+                "type", hisInquirysVO.getType());
+        inquiryInfoQe.eq(hisInquirysVO.getSign() != null,
+                "sign", hisInquirysVO.getSign());
+        inquiryInfoQe.ge(hisInquirysVO.getStartDate() != null,
+                "gmt_create", hisInquirysVO.getStartDate());
+        inquiryInfoQe.le(hisInquirysVO.getEndDate() != null,
+                "gmt_create", hisInquirysVO.getEndDate());
+        inquiryInfoQe.orderByDesc(hisInquirysVO.getOrderType() == 1, "gmt_modified");
         inquiryInfoQe.orderByAsc(hisInquirysVO.getOrderType() == 2, "gmt_modified");
-        
+
         if (hisInquirysVO.getDisType() == 1) {
             Date nowDate = DateUtil.now();
             Date lastDate = DateUtil.addMonth(nowDate, -6);
@@ -313,19 +321,23 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             inquiryInfoQe.likeRight("diagnose", hisInquirysVO.getDisName());
         }
 
-        Page<InquiryInfo> inquiryInfoPage = new Page<>(hisInquirysVO.getCurrent(),hisInquirysVO.getSize());
+        Page<InquiryInfo> inquiryInfoPage = new Page<>(hisInquirysVO.getCurrent(), hisInquirysVO.getSize());
         IPage<InquiryInfo> iPage = this.page(inquiryInfoPage, inquiryInfoQe);
-    	BeanUtil.copyProperties(iPage, hisInquiryDTOPage);
-        
+        BeanUtil.copyProperties(iPage, hisInquiryDTOPage);
+
         List<InquiryInfo> inquiryInfoList = iPage.getRecords();
         if (inquiryInfoList.size() == 0) {
             return null;
         }
 
-        List<Long> hospitalDeptIdList = inquiryInfoList.stream().map(i -> i.getHospitalDeptId()).distinct().collect(Collectors.toList());
-        List<Long> doctorIdList = inquiryInfoList.stream().map(i -> i.getDoctorId()).distinct().collect(Collectors.toList());
-        List<Long> patientIdList = inquiryInfoList.stream().map(i -> i.getPatientId()).distinct().collect(Collectors.toList());
-        List<Long> inquiryIdList = inquiryInfoList.stream().map(i -> i.getId()).distinct().collect(Collectors.toList());
+        List<Long> hospitalDeptIdList = inquiryInfoList.stream()
+                .map(i -> i.getHospitalDeptId()).distinct().collect(Collectors.toList());
+        List<Long> doctorIdList = inquiryInfoList.stream()
+                .map(i -> i.getDoctorId()).distinct().collect(Collectors.toList());
+        List<Long> patientIdList = inquiryInfoList.stream()
+                .map(i -> i.getPatientId()).distinct().collect(Collectors.toList());
+        List<Long> inquiryIdList = inquiryInfoList.stream()
+                .map(i -> i.getId()).distinct().collect(Collectors.toList());
 
         Map<Long, HospitalDept> hospitalDeptMap = hospitalDeptFacade.hospitalDeptInfoMapByIds(hospitalDeptIdList);
         Map<Long, DoctorInfo> doctorInfoMap = doctorInfoFacade.doctorInfoMapByIds(doctorIdList);
@@ -338,8 +350,13 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             BeanUtil.copyProperties(i, hisInquiryDTO);
             hisInquiryDTO.setInquiryDate(i.getGmtModified());
             hisInquiryDTO.setInquiryTime(i.getGmtModified());
-            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));
+            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());
@@ -355,22 +372,22 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         hisInquiryDTOPage.setRecords(hisInquiryDTOList);
         return hisInquiryDTOPage;
     }
-    
+
     /**
      * 急诊-历史病历列表
-     * 
+     *
      * @param hisInquirysForJzVO
      * @return
      */
-    public HisInquirysForJzDTO hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO){
-    	RespDTO<HisInquirysForJzDTO> res = tranServiceClient.hisInquirysForJz(hisInquirysForJzVO);
-    	RespDTOUtil.respNGDeal(res, "获取急诊历史病历列表失败");
-    	return res.data;
+    public HisInquirysForJzDTO hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO) {
+        RespDTO<HisInquirysForJzDTO> res = tranServiceClient.hisInquirysForJz(hisInquirysForJzVO);
+        RespDTOUtil.respNGDeal(res, "获取急诊历史病历列表失败");
+        return res.data;
     }
-    
+
     /**
      * 对接-历史病历列表
-     * 
+     *
      * @param hisInquirysForDjVO
      * @return
      */
@@ -412,11 +429,14 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             return null;
         }
 
-        Map<Long, List<InquiryDetail>> inquiryDetailMap = inquiryDetailFacade.getDetailsByInquryIds(inquiryInfoList.stream().map(i -> i.getId()).collect(Collectors.toList()));
-        List<HisInquirysForDjDTO> hisInquirysForDjDTOList = BeanUtil.listCopyTo(inquiryInfoList, HisInquirysForDjDTO.class);
+        Map<Long, List<InquiryDetail>> inquiryDetailMap = inquiryDetailFacade.getDetailsByInquryIds(
+                inquiryInfoList.stream().map(i -> i.getId()).collect(Collectors.toList()));
+        List<HisInquirysForDjDTO> hisInquirysForDjDTOList = BeanUtil.listCopyTo(
+                inquiryInfoList, HisInquirysForDjDTO.class);
 
         hisInquirysForDjDTOList.forEach(i -> {
-            i.setContentList(inquiryDetailMap.get(i.getId()).stream().map(k -> k.getContentValue()).collect(Collectors.toList()));
+            i.setContentList(inquiryDetailMap.get(i.getId()).stream()
+                    .map(k -> k.getContentValue()).collect(Collectors.toList()));
         });
 
         return hisInquirysForDjDTOList;
@@ -431,10 +451,10 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      */
     public GetInquiryDetailDTO getInquiryDetail(GetInquiryDetailVO getInquiryDetailVO) {
         GetInquiryDetailDTO getInquiryDetailDTO = new GetInquiryDetailDTO();
-        
+
         InquiryInfo inquiryInfo = this.getById(getInquiryDetailVO.getInquiryId());
         List<InquiryDetail> inquiryDetailList = inquiryDetailFacade.getListByInquryId(getInquiryDetailVO.getInquiryId());
-        
+
         getInquiryDetailDTO.setDataJson(inquiryInfo.getDataJson());
         getInquiryDetailDTO.setDetailList(inquiryDetailList);
 
@@ -448,7 +468,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      * @return
      */
     public List<GetEvaluationsDTO> getEvaluations(GetEvaluationsVO getEvaluationsVO) {
-        List<InquiryEvaluation> inquiryEvaluationList = inquiryEvaluationFacade.getEvaluationsByInquiryId(getEvaluationsVO.getInquiryId());
+        List<InquiryEvaluation> inquiryEvaluationList =
+                inquiryEvaluationFacade.getEvaluationsByInquiryId(getEvaluationsVO.getInquiryId());
         return BeanUtil.listCopyTo(inquiryEvaluationList, GetEvaluationsDTO.class);
     }
 
@@ -465,65 +486,67 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         List<InquiryScale> inquiryScaleList = inquiryScaleFacade.list(queryWrapper);
         return BeanUtil.listCopyTo(inquiryScaleList, GetEvaluationScalesDTO.class);
     }
-    
+
     /**
      * 急诊-添加二次诊断
-     * 
+     *
      * @param addDiagnoseSecondVO
      * @return
      */
-    public Boolean addDiagnoseSecond(AddDiagnoseSecondVO addDiagnoseSecondVO){
-    	RespDTO<Boolean> res = tranServiceClient.addDiagnoseSecond(addDiagnoseSecondVO);
-    	RespDTOUtil.respNGDeal(res, "添加二次诊断失败");
-    	return res.data;
+    public Boolean addDiagnoseSecond(AddDiagnoseSecondVO addDiagnoseSecondVO) {
+        RespDTO<Boolean> res = tranServiceClient.addDiagnoseSecond(addDiagnoseSecondVO);
+        RespDTOUtil.respNGDeal(res, "添加二次诊断失败");
+        return res.data;
     }
-    
-    public void exportInquirys(HttpServletResponse response,ExportInquirysVO exportInquirysVO){
-    	RespDTO<List<GetExportInquirysDTO>> res = tranServiceClient.getExportInquirys(exportInquirysVO.getInquiryIds());
-    	RespDTOUtil.respNGDeal(res, "导出病历失败");
-    	List<GetExportInquirysDTO> getExportInquirysDTOList = res.data;
-    	HSSFWorkbook workbook = null;
-    	ServletOutputStream outputStream = null;
-    	try{
-        	workbook = new HSSFWorkbook();
-        	HSSFSheet sheet = workbook.createSheet("统计表");
-        	
-        	String[] headers={"序号","性别","年龄","主诉","现病史","其他史","查体","化验","辅检","医嘱","诊断","二次诊断*"};
-        	HSSFRow headRow = sheet.createRow(0);
-        	for (int i =0;i <headers.length;i++){
-        		headRow.createCell(i).setCellValue(headers[i]);
-        	}
-        	
-        	int rowNum=1;
-        	for(GetExportInquirysDTO getExportInquirysDTO : getExportInquirysDTOList){
-        		HSSFRow row=sheet.createRow(rowNum);
-        		row.createCell(0).setCellValue(getExportInquirysDTO.getLineNum());
-        		row.createCell(1).setCellValue(getExportInquirysDTO.getPatientSex());
-        		row.createCell(2).setCellValue(getExportInquirysDTO.getPatientAge());
-        		for(int type=1;type<=9;type++){
-        			row.createCell(type+2).setCellValue(getExportInquirysDTO.getDetailMap().get(type));
-        		}
-        		rowNum++;
-        	}
-        	
-        	String fileName = "data.xls";
+
+    public void exportInquirys(HttpServletResponse response, ExportInquirysVO exportInquirysVO) {
+        RespDTO<List<GetExportInquirysDTO>> res = tranServiceClient.getExportInquirys(exportInquirysVO.getInquiryIds());
+        RespDTOUtil.respNGDeal(res, "导出病历失败");
+        List<GetExportInquirysDTO> getExportInquirysDTOList = res.data;
+        HSSFWorkbook workbook = null;
+        ServletOutputStream outputStream = null;
+        try {
+            workbook = new HSSFWorkbook();
+            HSSFSheet sheet = workbook.createSheet("统计表");
+
+            String[] headers = { "序号", "性别", "年龄", "主诉", "现病史", "其他史",
+                    "查体", "化验", "辅检", "医嘱", "诊断", "二次诊断*" };
+            HSSFRow headRow = sheet.createRow(0);
+            for (int i = 0; i < headers.length; i++) {
+                headRow.createCell(i).setCellValue(headers[i]);
+            }
+
+            int rowNum = 1;
+            for (GetExportInquirysDTO getExportInquirysDTO : getExportInquirysDTOList) {
+                HSSFRow row = sheet.createRow(rowNum);
+                row.createCell(0).setCellValue(getExportInquirysDTO.getLineNum());
+                row.createCell(1).setCellValue(getExportInquirysDTO.getPatientSex());
+                row.createCell(2).setCellValue(getExportInquirysDTO.getPatientAge());
+                for (int type = 1; type <= 9; type++) {
+                    row.createCell(type + 2).setCellValue(getExportInquirysDTO.getDetailMap().get(type));
+                }
+                rowNum++;
+            }
+
+            String fileName = "data.xls";
             response.setContentType("application/vnd.ms-excel");
-            response.setHeader("Content-Disposition", "attachment;filename="+URLEncoder.encode(fileName, "utf-8"));
+            response.setHeader("Content-Disposition",
+                    "attachment;filename=" + URLEncoder.encode(fileName, "utf-8"));
             outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.close();
-        } catch (Exception e){
-        	throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
+        } catch (Exception e) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
         } finally {
-        	try {
-        		if(workbook!=null){
-        			workbook.close();
-        		}
-        	} catch (IOException e) {
-        		e.printStackTrace();
-        	}
-		}
+            try {
+                if (workbook != null) {
+                    workbook.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
     }
-    
+
 
 }

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

@@ -1,12 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.TranServiceClient;
@@ -19,6 +12,12 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 患者业务逻辑

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

@@ -1,17 +1,5 @@
 package com.diagbot.web;
 
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetEvaluationScalesDTO;
@@ -36,11 +24,20 @@ import com.diagbot.vo.HisInquirysForJzVO;
 import com.diagbot.vo.HisInquirysVO;
 import com.diagbot.vo.ReadInquiryVO;
 import com.diagbot.vo.SaveInquiryVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * @author rengb
  * @since 2018-11-23
@@ -82,7 +79,7 @@ public class InquiryInfoController {
     public RespDTO<IPage<HisInquiryDTO>> hisInquirys(@Valid @RequestBody HisInquirysVO hisInquirysVO) {
         return RespDTO.onSuc(inquiryInfoFacade.hisInquirys(hisInquirysVO));
     }
-    
+
     @ApiOperation(value = "ICSS三期-急诊-历史病历列表[by:rengb]")
     @PostMapping("/hisInquirysForJz")
     @SysLogger("hisInquirysForJz")
@@ -118,18 +115,18 @@ public class InquiryInfoController {
     public RespDTO<List<GetEvaluationScalesDTO>> getEvaluationScales(@Valid @RequestBody GetEvaluationScalesVO getEvaluationScalesVO) {
         return RespDTO.onSuc(inquiryInfoFacade.getEvaluationScales(getEvaluationScalesVO));
     }
-    
+
     @ApiOperation(value = "ICSS三期-急诊-添加二次诊断[by:rengb]")
     @PostMapping("/addDiagnoseSecond")
     @SysLogger("addDiagnoseSecond")
     public RespDTO<Boolean> addDiagnoseSecond(@Valid @RequestBody AddDiagnoseSecondVO addDiagnoseSecondVO) {
         return RespDTO.onSuc(inquiryInfoFacade.addDiagnoseSecond(addDiagnoseSecondVO));
     }
-    
+
     @ApiOperation(value = "ICSS三期-急诊-导出病历[by:rengb]")
     @PostMapping("/exportInquirys")
-    public void exportInquirys(HttpServletResponse response,@Valid @RequestBody ExportInquirysVO exportInquirysVO){
-    	inquiryInfoFacade.exportInquirys(response,exportInquirysVO);
+    public void exportInquirys(HttpServletResponse response, @Valid @RequestBody ExportInquirysVO exportInquirysVO) {
+        inquiryInfoFacade.exportInquirys(response, exportInquirysVO);
     }
 
 

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

@@ -1,14 +1,6 @@
 package com.diagbot.web;
 
 
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
@@ -16,11 +8,17 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PatientInfoFacade;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.validation.Valid;
+
 /**
  * <p>
  * 患者信息表 前端控制器

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

@@ -95,7 +95,14 @@ public class InquiryEvaluatorFacade extends InquiryEvaluatorServiceImpl {
      */
     public EvaluatorCalDTO evaluatorCal(EvaluatorCalVO evaluatorCalVO) {
         EvaluatorCalDTO evaluatorCalDTO = evaluatorCalPrav(evaluatorCalVO);
-        evaluatorCalDTO.setPhysicalInfoList(Lists.newArrayList(physicalInfoFacade.listByIds(Arrays.asList(evaluatorCalDTO.getPhysicalTypes().split(",")).stream().map(i -> Integer.parseInt(i)).collect(Collectors.toList()))));
+        evaluatorCalDTO.setPhysicalInfoList(
+                Lists.newArrayList(
+                        physicalInfoFacade.listByIds(
+                                Arrays.asList(evaluatorCalDTO.getPhysicalTypes().split(",")).stream()
+                                        .map(i -> Integer.parseInt(i)).collect(Collectors.toList())
+                        )
+                )
+        );
         return evaluatorCalDTO;
     }
 

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

@@ -167,19 +167,31 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
         QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<InquiryInfo>();
         inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
-        inquiryInfoQe.eq(hisInquirysVO.getHospitalId() != null, "hospital_id", hisInquirysVO.getHospitalId());
-        inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getHospitalCode()), "hospital_code", hisInquirysVO.getHospitalCode());
-        inquiryInfoQe.eq(hisInquirysVO.getHospitalDeptId() != null, "hospital_dept_id", hisInquirysVO.getHospitalDeptId());
-        inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getHospitalDeptCode()), "hospital_dept_code", hisInquirysVO.getHospitalDeptCode());
-        inquiryInfoQe.eq(hisInquirysVO.getDoctorId() != null, "doctor_id", hisInquirysVO.getDoctorId());
-        inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getDoctorCode()), "doctor_code", hisInquirysVO.getDoctorCode());
-        inquiryInfoQe.eq(hisInquirysVO.getPatientId() != null, "patient_id", hisInquirysVO.getPatientId());
-        inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getPatientCode()), "patient_code", hisInquirysVO.getPatientCode());
-        inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getPatientIdNo()), "patient_id_no", hisInquirysVO.getPatientIdNo());
-        inquiryInfoQe.eq(hisInquirysVO.getType() != null, "type", hisInquirysVO.getType());
-
-        inquiryInfoQe.ge(hisInquirysVO.getStartDate() != null, "gmt_create", hisInquirysVO.getStartDate());
-        inquiryInfoQe.le(hisInquirysVO.getEndDate() != null, "gmt_create", hisInquirysVO.getEndDate());
+        inquiryInfoQe.eq(hisInquirysVO.getHospitalId() != null,
+                "hospital_id", hisInquirysVO.getHospitalId());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getHospitalCode()),
+                "hospital_code", hisInquirysVO.getHospitalCode());
+        inquiryInfoQe.eq(hisInquirysVO.getHospitalDeptId() != null,
+                "hospital_dept_id", hisInquirysVO.getHospitalDeptId());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getHospitalDeptCode()),
+                "hospital_dept_code", hisInquirysVO.getHospitalDeptCode());
+        inquiryInfoQe.eq(hisInquirysVO.getDoctorId() != null,
+                "doctor_id", hisInquirysVO.getDoctorId());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getDoctorCode()),
+                "doctor_code", hisInquirysVO.getDoctorCode());
+        inquiryInfoQe.eq(hisInquirysVO.getPatientId() != null,
+                "patient_id", hisInquirysVO.getPatientId());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getPatientCode()),
+                "patient_code", hisInquirysVO.getPatientCode());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getPatientIdNo()),
+                "patient_id_no", hisInquirysVO.getPatientIdNo());
+        inquiryInfoQe.eq(hisInquirysVO.getType() != null,
+                "type", hisInquirysVO.getType());
+
+        inquiryInfoQe.ge(hisInquirysVO.getStartDate() != null,
+                "gmt_create", hisInquirysVO.getStartDate());
+        inquiryInfoQe.le(hisInquirysVO.getEndDate() != null,
+                "gmt_create", hisInquirysVO.getEndDate());
 
         if (hisInquirysVO.getOrderType() == null || hisInquirysVO.getOrderType() == 1) {
             inquiryInfoQe.orderByDesc("gmt_modified");
@@ -189,8 +201,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             inquiryInfoQe.orderByDesc("inquiry_code");
         } else if (hisInquirysVO.getOrderType() == 4) {
             inquiryInfoQe.orderByAsc("inquiry_code");
-        } else{
-        	inquiryInfoQe.orderByDesc("gmt_modified");
+        } else {
+            inquiryInfoQe.orderByDesc("gmt_modified");
         }
 
         List<HisInquiryDTO> hisInquiryDTOList = BeanUtil.listCopyTo(list(inquiryInfoQe), HisInquiryDTO.class);
@@ -211,7 +223,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      * @return
      */
     public GetInquiryDetailDTO getInquiryDetail(GetInquiryDetailVO getInquiryDetailVO) {
-        if (getInquiryDetailVO.getHospitalId() == null && StringUtil.isBlank(getInquiryDetailVO.getHospitalCode())) {
+        if (getInquiryDetailVO.getHospitalId() == null
+                && StringUtil.isBlank(getInquiryDetailVO.getHospitalCode())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "医院信息(医院id或者医院编码)必传！");
         }
         /*if (getInquiryDetailVO.getHospitalDeptId() == null && StringUtil.isBlank(getInquiryDetailVO.getHospitalDeptCode())) {
@@ -220,21 +233,32 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         if (getInquiryDetailVO.getDoctorId() == null && StringUtil.isBlank(getInquiryDetailVO.getDoctorCode())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "医生信息(医生id或者医生编码)必传！");
         }*/
-        if (getInquiryDetailVO.getPatientId() == null && StringUtil.isBlank(getInquiryDetailVO.getPatientCode()) && StringUtil.isBlank(getInquiryDetailVO.getPatientIdNo())) {
+        if (getInquiryDetailVO.getPatientId() == null
+                && StringUtil.isBlank(getInquiryDetailVO.getPatientCode())
+                && StringUtil.isBlank(getInquiryDetailVO.getPatientIdNo())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "患者信息(患者id或者患者编码或者患者病历号)必传！");
         }
 
         QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<InquiryInfo>();
         inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
-        inquiryInfoQe.eq(getInquiryDetailVO.getHospitalId() != null, "hospital_id", getInquiryDetailVO.getHospitalId());
-        inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getHospitalCode()), "hospital_code", getInquiryDetailVO.getHospitalCode());
-        inquiryInfoQe.eq(getInquiryDetailVO.getHospitalDeptId() != null, "hospital_dept_id", getInquiryDetailVO.getHospitalDeptId());
-        inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getHospitalDeptCode()), "hospital_dept_code", getInquiryDetailVO.getHospitalDeptCode());
-        inquiryInfoQe.eq(getInquiryDetailVO.getDoctorId() != null, "doctor_id", getInquiryDetailVO.getDoctorId());
-        inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getDoctorCode()), "doctor_code", getInquiryDetailVO.getDoctorCode());
-        inquiryInfoQe.eq(getInquiryDetailVO.getPatientId() != null, "patient_id", getInquiryDetailVO.getPatientId());
-        inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getPatientCode()), "patient_code", getInquiryDetailVO.getPatientCode());
-        inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getPatientIdNo()), "patient_id_no", getInquiryDetailVO.getPatientIdNo());
+        inquiryInfoQe.eq(getInquiryDetailVO.getHospitalId() != null,
+                "hospital_id", getInquiryDetailVO.getHospitalId());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getHospitalCode()),
+                "hospital_code", getInquiryDetailVO.getHospitalCode());
+        inquiryInfoQe.eq(getInquiryDetailVO.getHospitalDeptId() != null,
+                "hospital_dept_id", getInquiryDetailVO.getHospitalDeptId());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getHospitalDeptCode()),
+                "hospital_dept_code", getInquiryDetailVO.getHospitalDeptCode());
+        inquiryInfoQe.eq(getInquiryDetailVO.getDoctorId() != null,
+                "doctor_id", getInquiryDetailVO.getDoctorId());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getDoctorCode()),
+                "doctor_code", getInquiryDetailVO.getDoctorCode());
+        inquiryInfoQe.eq(getInquiryDetailVO.getPatientId() != null,
+                "patient_id", getInquiryDetailVO.getPatientId());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getPatientCode()),
+                "patient_code", getInquiryDetailVO.getPatientCode());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getPatientIdNo()),
+                "patient_id_no", getInquiryDetailVO.getPatientIdNo());
         inquiryInfoQe.eq("inquiry_code", getInquiryDetailVO.getInquiryCode());
 
         InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe, false);
@@ -281,7 +305,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
                 getInquiryDetailDTO.setSupplement(inquiryDetailMap.get(4).getContentValue());
             }
         }
-        getInquiryDetailDTO.setPhysicalRes(ListUtil.isNotEmpty(inquiryEvaluatorList) ? inquiryEvaluatorList.get(0).getPhysicalRes() : null);
+        getInquiryDetailDTO.setPhysicalRes(
+                ListUtil.isNotEmpty(inquiryEvaluatorList) ? inquiryEvaluatorList.get(0).getPhysicalRes() : null);
         if (ListUtil.isNotEmpty(inquiryReportList)) {
             for (InquiryReport inquiryReport : inquiryReportList) {
                 if (StringUtil.isNotBlank(inquiryReport.getOriginalImage())) {

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

@@ -1,16 +1,5 @@
 package com.diagbot.web;
 
-import java.util.List;
-
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.HisInquiryDTO;
@@ -22,9 +11,17 @@ import com.diagbot.vo.GetInquiryDetailVO;
 import com.diagbot.vo.HisInquirysVO;
 import com.diagbot.vo.RecordCheckVO;
 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
@@ -46,7 +43,7 @@ public class InquiryInfoController {
     public RespDTO<SaveInquiryDTO> saveInquiry(@Valid @RequestBody SaveInquiryVO saveInquiryVO) {
         return RespDTO.onSuc(inquiryInfoFacade.saveInquiry(saveInquiryVO));
     }
-    
+
     @ApiOperation(value = "问诊记录检查确认[by:rengb]")
     @PostMapping("/recordCheck")
     @SysLogger("recordCheck")

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

@@ -1,15 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.GetExportInquirysDTO;
@@ -31,6 +21,15 @@ import com.diagbot.vo.AddDiagnoseSecondVO;
 import com.diagbot.vo.HisInquirysForJzVO;
 import com.diagbot.vo.SaveInquiryToHisVO;
 import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 对接层问诊信息业务逻辑
@@ -38,17 +37,17 @@ import com.google.common.collect.Lists;
  * @since 2019-3-18
  */
 @Component
-public class InquiryInfoFacade extends InquiryInfoServiceImpl{
-	
-	@Autowired
+public class InquiryInfoFacade extends InquiryInfoServiceImpl {
+
+    @Autowired
     private InquiryDetailFacade inquiryDetailFacade;
-	@Autowired
-	private PatientInfoFacade patientInfoFacade;
-	@Autowired
-	@Qualifier("inquiryDetailServiceImpl")
-	private InquiryDetailServiceImpl inquiryDetailServiceImpl;
-	
-	/**
+    @Autowired
+    private PatientInfoFacade patientInfoFacade;
+    @Autowired
+    @Qualifier("inquiryDetailServiceImpl")
+    private InquiryDetailServiceImpl inquiryDetailServiceImpl;
+
+    /**
      * 问诊记录保存
      *
      * @param saveInquiryToHisVO
@@ -67,49 +66,51 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl{
         InquiryInfo inquiryInfo = getOne(inquiryInfoQe, false);
 
         if (inquiryInfo == null) {
-        	inquiryInfo = new InquiryInfo();
-        	inquiryInfo.setGmtCreate(now);
+            inquiryInfo = new InquiryInfo();
+            inquiryInfo.setGmtCreate(now);
         } else {
             QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
             inquiryDetailQe.eq("inquiry_id", inquiryInfo.getId());
             inquiryDetailQe.ne("type", 9);
             inquiryDetailFacade.remove(inquiryDetailQe);
         }
-        
+
         inquiryInfo.setGmtModified(now);
         BeanUtil.copyProperties(saveInquiryToHisVO, inquiryInfo);
         saveOrUpdate(inquiryInfo);
-        
+
         List<InquiryDetail> inquiryDetailList = BeanUtil.listCopyTo(saveInquiryToHisVO.getDetailList(), InquiryDetail.class);
-        for(InquiryDetail i : inquiryDetailList){
-        	i.setInquiryId(inquiryInfo.getId());
-        	i.setGmtCreate(now);
-        	i.setGmtModified(now);
+        for (InquiryDetail i : inquiryDetailList) {
+            i.setInquiryId(inquiryInfo.getId());
+            i.setGmtCreate(now);
+            i.setGmtModified(now);
         }
         inquiryDetailServiceImpl.saveBatch(inquiryDetailList);
 
         return true;
     }
-    
+
     /**
      * 急诊-历史病历列表
-     * 
+     *
      * @param hisInquirysForJzVO
      * @return
      */
-    public HisInquirysForJzDTO hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO){
-    	HisInquirysForJzDTO hisInquirysForJzDTO = new HisInquirysForJzDTO();
-    	
-    	IPage<HisInquirysForJzDetailDTO> ipage = this.baseMapper.hisInquirysForJz(hisInquirysForJzVO);
-    	List<HisInquirysForJzDetailDTO> inquiryList = ipage.getRecords();
-    	
-    	if(ListUtil.isNotEmpty(inquiryList)){
-            List<Long> patientIdList = inquiryList.stream().map(i -> i.getPatientId()).distinct().collect(Collectors.toList());
-            List<Long> inquiryIdList = inquiryList.stream().map(i -> i.getInquiryId()).distinct().collect(Collectors.toList());
+    public HisInquirysForJzDTO hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO) {
+        HisInquirysForJzDTO hisInquirysForJzDTO = new HisInquirysForJzDTO();
+
+        IPage<HisInquirysForJzDetailDTO> ipage = this.baseMapper.hisInquirysForJz(hisInquirysForJzVO);
+        List<HisInquirysForJzDetailDTO> inquiryList = ipage.getRecords();
+
+        if (ListUtil.isNotEmpty(inquiryList)) {
+            List<Long> patientIdList = inquiryList.stream()
+                    .map(i -> i.getPatientId()).distinct().collect(Collectors.toList());
+            List<Long> inquiryIdList = inquiryList.stream()
+                    .map(i -> i.getInquiryId()).distinct().collect(Collectors.toList());
 
             Map<Long, PatientInfo> patientInfoMap = patientInfoFacade.patientInfoMapByIds(patientIdList);
             Map<Long, List<InquiryDetail>> inquiryDetailListMap = inquiryDetailFacade.getDetailsByInquryIds(inquiryIdList);
-        	
+
             inquiryList.forEach(i -> {
                 PatientInfo patientInfo = patientInfoMap.get(i.getPatientId());
                 if (patientInfo != null) {
@@ -118,98 +119,102 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl{
                     i.setPatientSex(SexTypeEnum.getName(patientInfo.getSex()));
                     i.setPatientAge(DateUtil.yearCompare(patientInfo.getBirthday(), DateUtil.now()));
                 }
-                
-                List<InquiryDetail> detailList= inquiryDetailListMap.get(i.getInquiryId()).stream().filter(inquiryDetail->inquiryDetail.getType()!=9).collect(Collectors.toList());
+
+                List<InquiryDetail> detailList = inquiryDetailListMap.get(i.getInquiryId()).stream()
+                        .filter(inquiryDetail -> inquiryDetail.getType() != 9).collect(Collectors.toList());
                 i.setDetailList(detailList);
-                String diagnose = detailList.stream().filter(inquiryDetail->inquiryDetail.getType()==7).map(inquiryDetail->inquiryDetail.getContentValue()).collect(Collectors.toList()).get(0);
+                String diagnose = detailList.stream().filter(inquiryDetail -> inquiryDetail.getType() == 7)
+                        .map(inquiryDetail -> inquiryDetail.getContentValue()).collect(Collectors.toList()).get(0);
                 i.setDiagnose(diagnose.split(";")[0]);
             });
-    	}
-    	
-    	hisInquirysForJzDTO.setInquiryList(inquiryList);
-    	hisInquirysForJzDTO.setTotal(ipage.getTotal());
-    	
-    	return hisInquirysForJzDTO;
+        }
+
+        hisInquirysForJzDTO.setInquiryList(inquiryList);
+        hisInquirysForJzDTO.setTotal(ipage.getTotal());
+
+        return hisInquirysForJzDTO;
     }
-    
-    
+
+
     /**
      * 急诊-添加二次诊断
-     * 
+     *
      * @param addDiagnoseSecondVO
      * @return
      */
-    public Boolean addDiagnoseSecond(AddDiagnoseSecondVO addDiagnoseSecondVO){
-    	QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
-    	inquiryDetailQe.eq("inquiry_id", addDiagnoseSecondVO.getInquiryId());
-    	inquiryDetailQe.eq("type", 9);
-    	inquiryDetailFacade.remove(inquiryDetailQe);
-    	
-    	Date now = DateUtil.now();
-    	
-    	InquiryDetail inquiryDetail = new InquiryDetail();
-    	inquiryDetail.setContentValue(addDiagnoseSecondVO.getDiagnoseSecond());
-    	inquiryDetail.setType(9);
-    	inquiryDetail.setInquiryId(addDiagnoseSecondVO.getInquiryId());
-    	inquiryDetail.setGmtCreate(now);
-    	inquiryDetail.setGmtModified(now);
-    	inquiryDetail.setCreator(addDiagnoseSecondVO.getDoctorId().toString());
-    	inquiryDetail.setModifier(addDiagnoseSecondVO.getDoctorId().toString());
-    	
-    	return inquiryDetailFacade.save(inquiryDetail);
+    public Boolean addDiagnoseSecond(AddDiagnoseSecondVO addDiagnoseSecondVO) {
+        QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
+        inquiryDetailQe.eq("inquiry_id", addDiagnoseSecondVO.getInquiryId());
+        inquiryDetailQe.eq("type", 9);
+        inquiryDetailFacade.remove(inquiryDetailQe);
+
+        Date now = DateUtil.now();
+
+        InquiryDetail inquiryDetail = new InquiryDetail();
+        inquiryDetail.setContentValue(addDiagnoseSecondVO.getDiagnoseSecond());
+        inquiryDetail.setType(9);
+        inquiryDetail.setInquiryId(addDiagnoseSecondVO.getInquiryId());
+        inquiryDetail.setGmtCreate(now);
+        inquiryDetail.setGmtModified(now);
+        inquiryDetail.setCreator(addDiagnoseSecondVO.getDoctorId().toString());
+        inquiryDetail.setModifier(addDiagnoseSecondVO.getDoctorId().toString());
+
+        return inquiryDetailFacade.save(inquiryDetail);
     }
-    
+
     /**
      * 急诊-获取需要导出的问诊数据
-     * 
+     *
      * @param inquiryIds
      * @return
      */
-    public List<GetExportInquirysDTO> getExportInquirys(List<Long> inquiryIds){
-    	List<GetExportInquirysDTO> getExportInquirysDTOList = new ArrayList<>();
-    	
-    	if(inquiryIds.stream().distinct().count()!=inquiryIds.size()){
-    		throw new CommonException(CommonErrorCode.PARAM_IS_ERROR);
-    	}
-    	
-    	List<InquiryInfo> inquiryInfoList = Lists.newArrayList(listByIds(inquiryIds));
-    	if(inquiryInfoList.size()!=inquiryIds.size()){
-    		throw new CommonException(CommonErrorCode.PARAM_IS_ERROR);
-    	}
-    	
-    	List<Long> patientIdList = inquiryInfoList.stream().map(i -> i.getPatientId()).distinct().collect(Collectors.toList());
-    	Map<Long, PatientInfo> patientInfoMap = patientInfoFacade.patientInfoMapByIds(patientIdList);
-    	Map<Long,InquiryInfo> inquiryInfoMap = inquiryInfoList.stream().collect(Collectors.toMap(InquiryInfo::getId,i->i));
-    	Map<Long, List<InquiryDetail>> inquiryDetailListMap = inquiryDetailFacade.getDetailsByInquryIds(inquiryIds);
-    	
-    	Integer lineNum = 1;
-    	PatientInfo patientInfo = null;
-    	String diagnose = null;
-    	for(Long inquiryId : inquiryIds){
-    		GetExportInquirysDTO getExportInquirysDTO = new GetExportInquirysDTO();
-    		getExportInquirysDTO.setLineNum(lineNum);
-    		patientInfo = patientInfoMap.get(inquiryInfoMap.get(inquiryId).getPatientId());
-        	if (patientInfo != null) {
-        		getExportInquirysDTO.setPatientSex(SexTypeEnum.getName(patientInfo.getSex()));
-        		getExportInquirysDTO.setPatientAge(DateUtil.yearCompare(patientInfo.getBirthday(), DateUtil.now()));
-        	}
-    		
-    		Map<Integer,String> detailMap = inquiryDetailListMap.get(inquiryId).stream().collect(Collectors.toMap(InquiryDetail::getType, i->i.getContentValue()==null?"":i.getContentValue()));
-    		diagnose = detailMap.get(7);
-    		detailMap.put(7, detailMap.get(8));
-    		if(detailMap.get(9)!=null){
-    			diagnose = "";
-    		}
-    		detailMap.put(8, diagnose);
-    		getExportInquirysDTO.setDetailMap(detailMap);
-    		
-    		getExportInquirysDTOList.add(getExportInquirysDTO);
-    		lineNum++;
-    	}
-    	
-    	return getExportInquirysDTOList;
+    public List<GetExportInquirysDTO> getExportInquirys(List<Long> inquiryIds) {
+        List<GetExportInquirysDTO> getExportInquirysDTOList = new ArrayList<>();
+
+        if (inquiryIds.stream().distinct().count() != inquiryIds.size()) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR);
+        }
+
+        List<InquiryInfo> inquiryInfoList = Lists.newArrayList(listByIds(inquiryIds));
+        if (inquiryInfoList.size() != inquiryIds.size()) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR);
+        }
+
+        List<Long> patientIdList = inquiryInfoList.stream()
+                .map(i -> i.getPatientId()).distinct().collect(Collectors.toList());
+        Map<Long, PatientInfo> patientInfoMap = patientInfoFacade.patientInfoMapByIds(patientIdList);
+        Map<Long, InquiryInfo> inquiryInfoMap = inquiryInfoList.stream()
+                .collect(Collectors.toMap(InquiryInfo::getId, i -> i));
+        Map<Long, List<InquiryDetail>> inquiryDetailListMap = inquiryDetailFacade.getDetailsByInquryIds(inquiryIds);
+
+        Integer lineNum = 1;
+        PatientInfo patientInfo = null;
+        String diagnose = null;
+        for (Long inquiryId : inquiryIds) {
+            GetExportInquirysDTO getExportInquirysDTO = new GetExportInquirysDTO();
+            getExportInquirysDTO.setLineNum(lineNum);
+            patientInfo = patientInfoMap.get(inquiryInfoMap.get(inquiryId).getPatientId());
+            if (patientInfo != null) {
+                getExportInquirysDTO.setPatientSex(SexTypeEnum.getName(patientInfo.getSex()));
+                getExportInquirysDTO.setPatientAge(DateUtil.yearCompare(patientInfo.getBirthday(), DateUtil.now()));
+            }
+
+            Map<Integer, String> detailMap = inquiryDetailListMap.get(inquiryId).stream()
+                    .collect(Collectors.toMap(InquiryDetail::getType, i -> i.getContentValue() == null ? "" : i.getContentValue()));
+            diagnose = detailMap.get(7);
+            detailMap.put(7, detailMap.get(8));
+            if (detailMap.get(9) != null) {
+                diagnose = "";
+            }
+            detailMap.put(8, diagnose);
+            getExportInquirysDTO.setDetailMap(detailMap);
+
+            getExportInquirysDTOList.add(getExportInquirysDTO);
+            lineNum++;
+        }
+
+        return getExportInquirysDTOList;
     }
-	
 
 
 }

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

@@ -1,13 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.dto.SignInDTO;
@@ -18,6 +10,13 @@ import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
 import com.diagbot.vo.SignInVO;
 import com.google.common.collect.Lists;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 患者业务逻辑
@@ -39,7 +38,8 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
      * @return
      */
     public PatientInfoDTO getPatientInfo(PatientInfoVO patientInfoVO) {
-        PatientInfoDTO patientInfoDTO = this.getPatientInfos(patientInfoVO.getPatientCode(), patientInfoVO.getHospitalCode());
+        PatientInfoDTO patientInfoDTO = this.getPatientInfos(patientInfoVO.getPatientCode(),
+                patientInfoVO.getHospitalCode());
         return patientInfoDTO;
     }
 
@@ -59,36 +59,43 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
 
     /**
      * 根据ids获取病人信息
+     *
      * @param ids 病人ids
      * @return 病人信息
      */
     public Map<Long, PatientInfo> patientInfoMapByIds(List<Long> ids) {
-    	Map<Long, PatientInfo> patientInfoMap = this.listByIds(ids).stream().filter(i -> i.getIsDeleted().equals("N")).collect(Collectors.toMap(PatientInfo::getId, i -> i));
-    	return patientInfoMap;
+        Map<Long, PatientInfo> patientInfoMap = this.listByIds(ids).stream()
+                .filter(i -> i.getIsDeleted().equals("N")).collect(Collectors.toMap(PatientInfo::getId, i -> i));
+        return patientInfoMap;
     }
-   
+
     /**
      * 患者登录
+     *
      * @param signInVO
      * @return
      */
     public List<SignInDTO> signIn(SignInVO signInVO) {
-    	String time = DateUtil.formatDateTime(new Date());
-    	List<SignInDTO> list = Lists.newArrayList();
-    	list.add(new SignInDTO("A001", "浙江大学医学院附属邵逸夫医院", "D01", "全科", "YS001", "付医生", "1600", "王明明", time, "4468352", "15"));
-    	list.add(new SignInDTO("A001", "浙江大学医学院附属邵逸夫医院", "D02", "儿科", "YS001", "付医生", "1600", "王明明", time, "4468352", "18"));
-    	if(signInVO.getPatientInfoType().equals("101")){
-    		if(signInVO.getPatientInfo().equals("10123439991230120X")){
-    			list.remove(1);
-    		}else if(signInVO.getPatientInfo().equals("666666180002301234")){
-    			list.clear();
-    		}else if(signInVO.getPatientInfo().equals("100000201901010000")){
-    			return null;
-    		}
-    	}
-    	
-    	return list;
+        String time = DateUtil.formatDateTime(new Date());
+        List<SignInDTO> list = Lists.newArrayList();
+        list.add(new SignInDTO("A001", "浙江大学医学院附属邵逸夫医院",
+                "D01", "全科", "YS001", "付医生",
+                "1600", "王明明", time, "4468352", "15"));
+        list.add(new SignInDTO("A001", "浙江大学医学院附属邵逸夫医院",
+                "D02", "儿科", "YS001", "付医生",
+                "1600", "王明明", time, "4468352", "18"));
+        if (signInVO.getPatientInfoType().equals("101")) {
+            if (signInVO.getPatientInfo().equals("10123439991230120X")) {
+                list.remove(1);
+            } else if (signInVO.getPatientInfo().equals("666666180002301234")) {
+                list.clear();
+            } else if (signInVO.getPatientInfo().equals("100000201901010000")) {
+                return null;
+            }
+        }
+
+        return list;
     }
-    
+
 
 }

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

@@ -1,14 +1,5 @@
 package com.diagbot.web;
 
-import java.util.List;
-
-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.GetExportInquirysDTO;
 import com.diagbot.dto.HisInquirysForJzDTO;
@@ -17,10 +8,17 @@ import com.diagbot.facade.InquiryInfoFacade;
 import com.diagbot.vo.AddDiagnoseSecondVO;
 import com.diagbot.vo.HisInquirysForJzVO;
 import com.diagbot.vo.SaveInquiryToHisVO;
-
 import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.List;
+
 /**
  * <p>
  * 对接层问诊信息控制器
@@ -34,60 +32,63 @@ import springfox.documentation.annotations.ApiIgnore;
 @Api(value = "对接层-问诊信息API", tags = { "对接层-问诊信息API" })
 @SuppressWarnings("unchecked")
 public class InquiryInfoController {
-	
-	 @Autowired
-	 private InquiryInfoFacade inquiryInfoFacade;
-	 
-	 /**
-	  * 问诊记录保存
-	  * @param saveInquiryToHisVO
-	  * @return
-	  */
-	 @PostMapping("/saveInquiryToHis")
-	 @SysLogger("saveInquiryToHis")
-	 @Transactional
-	 @ApiIgnore
-	 public RespDTO<Boolean> saveInquiryToHis(@RequestBody SaveInquiryToHisVO saveInquiryToHisVO) {
-	     return RespDTO.onSuc(inquiryInfoFacade.saveInquiryToHis(saveInquiryToHisVO));
-	 }
-	 
-	 /**
-	  * 急诊-历史病历列表
-	  * @param hisInquirysForJzVO
-	  * @return
-	  */
-	 @PostMapping("/hisInquirysForJz")
-	 @SysLogger("hisInquirysForJz")
-	 @ApiIgnore
-	 public RespDTO<HisInquirysForJzDTO> hisInquirysForJz(@RequestBody HisInquirysForJzVO hisInquirysForJzVO) {
-		 return RespDTO.onSuc(inquiryInfoFacade.hisInquirysForJz(hisInquirysForJzVO));
-	 }
-	 
-	 /**
-	  * 急诊-添加二次诊断
-	  * @param addDiagnoseSecondVO
-	  * @return
-	  */
-	 @PostMapping("/addDiagnoseSecond")
-	 @SysLogger("addDiagnoseSecond")
-	 @Transactional
-	 @ApiIgnore
-	 public RespDTO<Boolean> addDiagnoseSecond(@RequestBody AddDiagnoseSecondVO addDiagnoseSecondVO) {
-		 return RespDTO.onSuc(inquiryInfoFacade.addDiagnoseSecond(addDiagnoseSecondVO));
-	 }
-	 
-	 /**
-	  * 急诊-获取需要导出的问诊数据
-	  * @param inquiryIds
-	  * @return
-	  */
-	 @PostMapping("/getExportInquirys")
-	 @SysLogger("getExportInquirys")
-	 @ApiIgnore
-	 public RespDTO<List<GetExportInquirysDTO>> getExportInquirys(@RequestBody List<Long> inquiryIds) {
-		 return RespDTO.onSuc(inquiryInfoFacade.getExportInquirys(inquiryIds));
-	 } 
-	 
-	 
+
+    @Autowired
+    private InquiryInfoFacade inquiryInfoFacade;
+
+    /**
+     * 问诊记录保存
+     *
+     * @param saveInquiryToHisVO
+     * @return
+     */
+    @PostMapping("/saveInquiryToHis")
+    @SysLogger("saveInquiryToHis")
+    @Transactional
+    @ApiIgnore
+    public RespDTO<Boolean> saveInquiryToHis(@RequestBody SaveInquiryToHisVO saveInquiryToHisVO) {
+        return RespDTO.onSuc(inquiryInfoFacade.saveInquiryToHis(saveInquiryToHisVO));
+    }
+
+    /**
+     * 急诊-历史病历列表
+     *
+     * @param hisInquirysForJzVO
+     * @return
+     */
+    @PostMapping("/hisInquirysForJz")
+    @SysLogger("hisInquirysForJz")
+    @ApiIgnore
+    public RespDTO<HisInquirysForJzDTO> hisInquirysForJz(@RequestBody HisInquirysForJzVO hisInquirysForJzVO) {
+        return RespDTO.onSuc(inquiryInfoFacade.hisInquirysForJz(hisInquirysForJzVO));
+    }
+
+    /**
+     * 急诊-添加二次诊断
+     *
+     * @param addDiagnoseSecondVO
+     * @return
+     */
+    @PostMapping("/addDiagnoseSecond")
+    @SysLogger("addDiagnoseSecond")
+    @Transactional
+    @ApiIgnore
+    public RespDTO<Boolean> addDiagnoseSecond(@RequestBody AddDiagnoseSecondVO addDiagnoseSecondVO) {
+        return RespDTO.onSuc(inquiryInfoFacade.addDiagnoseSecond(addDiagnoseSecondVO));
+    }
+
+    /**
+     * 急诊-获取需要导出的问诊数据
+     *
+     * @param inquiryIds
+     * @return
+     */
+    @PostMapping("/getExportInquirys")
+    @SysLogger("getExportInquirys")
+    @ApiIgnore
+    public RespDTO<List<GetExportInquirysDTO>> getExportInquirys(@RequestBody List<Long> inquiryIds) {
+        return RespDTO.onSuc(inquiryInfoFacade.getExportInquirys(inquiryIds));
+    }
+
 
 }

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

@@ -1,17 +1,6 @@
 package com.diagbot.web;
 
 
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
@@ -22,11 +11,19 @@ import com.diagbot.facade.PatientInfoFacade;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
 import com.diagbot.vo.SignInVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 患者信息表 前端控制器
@@ -55,32 +52,32 @@ public class PatientInfoController {
     }
 
 
-   @ApiOperation(value = "页面顶部病人医生科室信息——查询[by:rengb]",
+    @ApiOperation(value = "页面顶部病人医生科室信息——查询[by:rengb]",
             notes = "hospitalCode：医院编号，必填<br>" +
                     "hospitalDeptCode：医院科室编号，必填<br>" +
                     "doctorCode：医院医生编号，必填<br>" +
                     "patientCode:医院患者编号，必填<br>")
     @PostMapping("/getTopPatientInfo")
     @SysLogger("getTopPatientInfo")
-   	@ApiIgnore
+    @ApiIgnore
     public RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@Valid @RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
         return RespDTO.onSuc(patientInfoFacade.getTopPatientInfo(getTopPatientInfoVO));
     }
-   
-   @PostMapping(value = "/patientInfoMapByIds")
-   @SysLogger("patientInfoMapByIds")
-   @ApiOperation(value = "根据ids获取病人信息[by:rengb]")
-   @ApiIgnore
-   RespDTO<Map<Long, PatientInfo>> patientInfoMapByIds(@RequestBody List<Long> ids) {
-       Map<Long, PatientInfo> result = patientInfoFacade.patientInfoMapByIds(ids);
-       return RespDTO.onSuc(result);
-   }
-   
-   @ApiOperation(value = "患者登录[by:rengb]")
-   @PostMapping("/signIn")
-   @SysLogger("signIn")
-   public RespDTO<List<SignInDTO>> signIn(@RequestBody SignInVO signInVO) {
-       return RespDTO.onSuc(patientInfoFacade.signIn(signInVO));
-   }
+
+    @PostMapping(value = "/patientInfoMapByIds")
+    @SysLogger("patientInfoMapByIds")
+    @ApiOperation(value = "根据ids获取病人信息[by:rengb]")
+    @ApiIgnore
+    RespDTO<Map<Long, PatientInfo>> patientInfoMapByIds(@RequestBody List<Long> ids) {
+        Map<Long, PatientInfo> result = patientInfoFacade.patientInfoMapByIds(ids);
+        return RespDTO.onSuc(result);
+    }
+
+    @ApiOperation(value = "患者登录[by:rengb]")
+    @PostMapping("/signIn")
+    @SysLogger("signIn")
+    public RespDTO<List<SignInDTO>> signIn(@RequestBody SignInVO signInVO) {
+        return RespDTO.onSuc(patientInfoFacade.signIn(signInVO));
+    }
 
 }