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

icss-service/src/main/java/com/diagbot/client/TranServiceClient.java

@@ -21,6 +21,7 @@ import com.diagbot.dto.TranFieldInfoDTO;
 import com.diagbot.entity.DoctorInfo;
 import com.diagbot.entity.HospitalDept;
 import com.diagbot.entity.PatientInfo;
+import com.diagbot.vo.AddDiagnoseSecondVO;
 import com.diagbot.vo.DoctorInfoVO;
 import com.diagbot.vo.HosCodeVO;
 import com.diagbot.vo.HospitalInfoVO;
@@ -114,13 +115,21 @@ public interface TranServiceClient {
     RespDTO<List<TranFieldInfoDTO>> getInfoByUuid(@RequestBody TranFieldInfoVO tranFieldInfoVO);
 
     /**
-     * 将问诊保存的一些相关信息发送到对接层
+     * 将问诊记录保存一份至对接层
      *
      * @param saveInquiryToHisVO
      * @return
      */
     @PostMapping("/inquiryInfo/saveInquiryToHis")
     RespDTO<Boolean> saveInquiryToHis(@RequestBody SaveInquiryToHisVO saveInquiryToHisVO);
+    
+    /**
+     * 急诊-添加二次诊断
+     * @param addDiagnoseSecondVO
+     * @return
+     */
+    @PostMapping("/inquiryInfo/addDiagnoseSecond")
+    RespDTO<Boolean> addDiagnoseSecond(@RequestBody AddDiagnoseSecondVO addDiagnoseSecondVO);
 
 
     /**

icss-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

@@ -22,6 +22,7 @@ import com.diagbot.dto.TranFieldInfoDTO;
 import com.diagbot.entity.DoctorInfo;
 import com.diagbot.entity.HospitalDept;
 import com.diagbot.entity.PatientInfo;
+import com.diagbot.vo.AddDiagnoseSecondVO;
 import com.diagbot.vo.DoctorInfoVO;
 import com.diagbot.vo.HosCodeVO;
 import com.diagbot.vo.HospitalInfoVO;
@@ -97,15 +98,20 @@ public class TranServiceHystrix implements TranServiceClient {
         log.error("【hystrix】调用{}异常", "saveInquiryToHis");
         return null;
     }
-
-
+    
+    @Override
+	public RespDTO<Boolean> addDiagnoseSecond(AddDiagnoseSecondVO addDiagnoseSecondVO) {
+    	log.error("【hystrix】调用{}异常", "addDiagnoseSecond");
+		return null;
+	}
+    
     //    @Override
     //    public Response<ResponseData> bayesPageData(SearchData searchData) {
     //        log.error("【hystrix】调用{}异常", "bayesPageData");
     //        return null;
     //    }
 
-    /**
+	/**
      * 根据医院编码获取化验公表映射关系-itemName不为空
      *
      * @param hosCodeVO

icss-service/src/main/java/com/diagbot/dto/HisInquirysForJzDTO.java

@@ -0,0 +1,142 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import com.diagbot.entity.InquiryDetail;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2018/11/19 18:56
+ */
+@ApiModel(value="急诊-历史病历列表接口出参")
+@Getter
+@Setter
+public class HisInquirysForJzDTO{
+	
+    /**
+     * 问诊记录id
+     */
+	@ApiModelProperty(value="问诊记录id")
+    private Long inquiryId;
+	
+	/**
+     * 医生id
+     */
+	@ApiModelProperty(value="医生id")
+    private Long doctorId;
+	
+    /**
+     * 医生姓名
+     */
+	@ApiModelProperty(value="医生姓名")
+    private String doctorName;
+	
+	/**
+	 * 就诊日期
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	@ApiModelProperty(value="就诊日期")
+	private Date inquiryDate;
+	
+	/**
+	 * 就诊时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value="就诊时间")
+	private Date inquiryTime;
+	
+    /**
+     * 诊断
+     */
+	@ApiModelProperty(value="诊断")
+    private String diagnose;
+	
+	/**
+     * 二次诊断的医生id
+     */
+	@ApiModelProperty(value="二次诊断的医生id")
+    private Long doctorIdSecond;
+	
+    /**
+     * 二次诊断的医生姓名
+     */
+	@ApiModelProperty(value="二次诊断的医生姓名")
+    private String doctorNameSecond;
+	
+	/**
+	 * 二次诊断的就诊时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value="二次诊断的就诊时间")
+	private Date inquiryTimeSecond;
+	
+    /**
+     * 二次诊断的诊断
+     */
+	@ApiModelProperty(value="二次诊断的诊断")
+    private String diagnoseSecond;
+	
+    /**
+     * 门诊号
+     */
+	@ApiModelProperty(value="门诊号")
+    private String inquiryCode;
+	
+    /**
+     * 医院科室id
+     */
+	@ApiModelProperty(value="医院科室id")
+    private Long hospitalDeptId;
+	
+    /**
+     * 医院科室名称
+     */
+	@ApiModelProperty(value="医院科室名称")
+    private String hospitalDeptName;
+	
+	/**
+     * 病人id
+     */
+	@ApiModelProperty(value="病人id")
+    private Long patientId;
+	
+	/**
+     * 病人姓名
+     */
+	@ApiModelProperty(value="病人姓名")
+    private String patientName;
+	
+    /**
+     * 病人性别
+     */
+	@ApiModelProperty(value="病人性别")
+    private String patientSex;
+	
+    /**
+     * 病人年龄
+     */
+	@ApiModelProperty(value="病人年龄")
+    private Integer patientAge;
+	
+    /**
+     * 病人证件号码
+     */
+	@ApiModelProperty(value="病人证件号码")
+    private String patientIdNo;
+    
+	/**
+     * 病历明细
+     */
+	@ApiModelProperty(value="病历明细")
+	private List<InquiryDetail> detailList;
+	
+	
+}

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

@@ -1,15 +1,15 @@
 package com.diagbot.facade;
 
-import com.diagbot.client.TranServiceClient;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.HospitalDept;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
+import java.util.List;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-import java.util.Map;
+import com.diagbot.client.TranServiceClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.HospitalDept;
+import com.diagbot.util.RespDTOUtil;
 
 /**
  * @author rgb
@@ -30,11 +30,7 @@ public class HospitalDeptFacade {
      */
     public Map<Long, HospitalDept> hospitalDeptInfoMapByIds(List<Long> ids) {
         RespDTO<Map<Long, HospitalDept>> retData = tranServiceClient.hospitalDeptInfoMapByIds(ids);
-        if (retData == null
-                || !CommonErrorCode.OK.getCode().equals(retData.code)) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取科室信息失败");
-        }
+        RespDTOUtil.respNGDeal(retData,"获取科室信息失败");
         return retData.data;
     }
 

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

@@ -13,6 +13,7 @@ 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.client.TranServiceClient;
 import com.diagbot.dto.GetEvaluationScalesDTO;
 import com.diagbot.dto.GetEvaluationsDTO;
@@ -20,10 +21,12 @@ import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.GetLastOtherDTO;
 import com.diagbot.dto.HisInquiryDTO;
 import com.diagbot.dto.HisInquirysForDjDTO;
+import com.diagbot.dto.HisInquirysForJzDTO;
 import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.ReadInquiryDrugDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SaveInquiryDTO;
 import com.diagbot.entity.DoctorInfo;
 import com.diagbot.entity.HospitalDept;
@@ -41,12 +44,15 @@ import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.StringUtil;
+import com.diagbot.vo.AddDiagnoseSecondVO;
 import com.diagbot.vo.GetEvaluationScalesVO;
 import com.diagbot.vo.GetEvaluationsVO;
 import com.diagbot.vo.GetInquiryDetailVO;
 import com.diagbot.vo.GetLastOtherVO;
 import com.diagbot.vo.HisInquirysForDjVO;
+import com.diagbot.vo.HisInquirysForJzVO;
 import com.diagbot.vo.HisInquirysVO;
 import com.diagbot.vo.IndexDataSaveVO;
 import com.diagbot.vo.PatientInfoVO;
@@ -143,6 +149,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             inquiryDetailList.forEach(i->{
             	i.setInquiryId(inquiryId_);
                 i.setGmtCreate(now);
+                i.setGmtModified(now);
             });
             inquiryDetailFacade.saveInquiryDetails(inquiryDetailList);
         }
@@ -152,6 +159,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             inquiryDrugList.stream().forEach(i -> {
                 i.setInquiryId(inquiryId_);
                 i.setGmtCreate(now);
+                i.setGmtModified(now);
             });
             inquiryDrugService.saveBatch(inquiryDrugList);
         }
@@ -160,6 +168,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             InquiryEvaluation inquiryEvaluation = new InquiryEvaluation();
             inquiryEvaluation.setInquiryId(inquiryId_);
             inquiryEvaluation.setGmtCreate(now);
+            inquiryEvaluation.setGmtModified(now);
             inquiryEvaluation.setHtmlContent(saveInquiryVO.getInquiryEvaluation().getHtmlContent());
             inquiryEvaluationFacade.save(inquiryEvaluation);
 
@@ -169,6 +178,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
                     i.setInquiryId(inquiryId_);
                     i.setInquiryEvaluationId(inquiryEvaluation.getId());
                     i.setGmtCreate(now);
+                    i.setGmtModified(now);
                 });
                 inquiryScaleService.saveBatch(inquiryScaleList);
             }
@@ -180,12 +190,12 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             indexDataFacade.saveIndexDatas(indexDataSaveVO);
         }
 
-        saveInquiryDTO.setInquiryId(inquiryId_);
-
         SaveInquiryToHisVO saveInquiryToHisVO = new SaveInquiryToHisVO();
         BeanUtil.copyProperties(saveInquiryVO, saveInquiryToHisVO);
-        tranServiceClient.saveInquiryToHis(saveInquiryToHisVO);
+        RespDTOUtil.respNGDeal(tranServiceClient.saveInquiryToHis(saveInquiryToHisVO), "问诊记录插入tran层失败");
 
+        saveInquiryDTO.setInquiryId(inquiryId_);
+        
         return saveInquiryDTO;
     }
 
@@ -318,10 +328,10 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             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());
+        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);
@@ -351,10 +361,60 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
         return hisInquiryDTOList;
     }
-
+    
+    /**
+     * 急诊-历史病历列表
+     * 
+     * @param hisInquirysForJzVO
+     * @return
+     */
+    public IPage<HisInquirysForJzDTO> hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO){
+    	IPage<HisInquirysForJzDTO> ipage = this.baseMapper.hisInquirysForJz(hisInquirysForJzVO);
+    	
+    	if(ListUtil.isNotEmpty(ipage.getRecords())){
+    		
+    		List<Long> hospitalDeptIdList = ipage.getRecords().stream().map(i -> i.getHospitalDeptId()).distinct().collect(Collectors.toList());
+            List<Long> patientIdList = ipage.getRecords().stream().map(i -> i.getPatientId()).distinct().collect(Collectors.toList());
+            List<Long> inquiryIdList = ipage.getRecords().stream().map(i -> i.getInquiryId()).distinct().collect(Collectors.toList());
+
+            List<Long> doctorIdList = ipage.getRecords().stream().map(i -> i.getDoctorId()).collect(Collectors.toList());
+            doctorIdList.addAll(ipage.getRecords().stream().map(i -> i.getDoctorIdSecond()).collect(Collectors.toList()));
+            doctorIdList = doctorIdList.stream().distinct().collect(Collectors.toList());
+            
+            Map<Long, HospitalDept> hospitalDeptMap = hospitalDeptFacade.hospitalDeptInfoMapByIds(hospitalDeptIdList);
+            Map<Long, PatientInfo> patientInfoMap = patientInfoFacade.patientInfoMapByIds(patientIdList);
+            Map<Long, List<InquiryDetail>> inquiryDetailMap = inquiryDetailFacade.getDetailsByInquryIds(inquiryIdList);
+            Map<Long, DoctorInfo> doctorInfoMap = doctorInfoFacade.doctorInfoMapByIds(doctorIdList);
+        	
+            ipage.getRecords().forEach(i -> {
+                i.setInquiryTime(i.getInquiryDate());
+                i.setHospitalDeptName(Optional.ofNullable(hospitalDeptMap.get(i.getHospitalDeptId())).map(t -> t.getName()).orElse(null));
+                i.setDoctorName(Optional.ofNullable(doctorInfoMap.get(i.getDoctorId())).map(t -> t.getName()).orElse(null));
+                i.setDoctorNameSecond(Optional.ofNullable(doctorInfoMap.get(i.getDoctorIdSecond())).map(t -> t.getName()).orElse(null));
+                PatientInfo patientInfo = patientInfoMap.get(i.getPatientId());
+                if (patientInfo != null) {
+                    i.setPatientName(patientInfo.getName());
+                    i.setPatientIdNo(patientInfo.getIdNo());
+                    i.setPatientSex(SexTypeEnum.getName(patientInfo.getSex()));
+                    i.setPatientAge(DateUtil.yearCompare(patientInfo.getBirthday(), DateUtil.now()));
+                }
+                
+                List<InquiryDetail> detailList= inquiryDetailMap.get(i.getInquiryId());
+                i.setDetailList(detailList);
+                String diagnose = detailList.stream().filter(inquiryDetail->inquiryDetail.getType()==7).map(inquiryDetail->inquiryDetail.getContent()).toString();
+                i.setDiagnose(diagnose.split(";")[0]);
+                
+            });
+             
+    	}
+    	
+    	return ipage;
+    }
+    
+    
     /**
      * 对接-历史病历列表
-     *
+     * 
      * @param hisInquirysForDjVO
      * @return
      */
@@ -447,5 +507,17 @@ 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;
+    }
 
 }

icss-service/src/main/java/com/diagbot/mapper/InquiryInfoMapper.java

@@ -3,7 +3,10 @@ package com.diagbot.mapper;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.HisInquirysForJzDTO;
 import com.diagbot.entity.InquiryInfo;
+import com.diagbot.vo.HisInquirysForJzVO;
 
 /**
  * <p>
@@ -25,4 +28,7 @@ public interface InquiryInfoMapper extends BaseMapper<InquiryInfo> {
 	 */
 	InquiryInfo getPatientLast(Map<String,Object> map);
 	
+	
+	IPage<HisInquirysForJzDTO> hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO);
+	
 }

icss-service/src/main/java/com/diagbot/vo/AddDiagnoseSecondVO.java

@@ -0,0 +1,40 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rengb
+ * @time 2019年3月12日下午2:29:43
+ */
+@Getter
+@Setter
+public class AddDiagnoseSecondVO {
+	
+	/**
+	 * 问诊记录id
+	 */
+	@ApiModelProperty(value="问诊记录id",required=true)
+	@NotNull(message="问诊记录id必传")
+	private Long inquiryId;
+	
+    /**
+     * 当前医生id
+     */
+	@ApiModelProperty(value="当前医生id",required=true)
+	@NotNull(message="当前医生id必传")
+    private Long doctorId;
+	
+	/**
+	 * 二次诊断
+	 */
+	@ApiModelProperty(value="二次诊断",required=true)
+	@NotBlank(message="二次诊断必传")
+	private String diagnoseSecond;
+
+}

icss-service/src/main/java/com/diagbot/vo/HisInquirysForJzVO.java

@@ -0,0 +1,58 @@
+package com.diagbot.vo;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotNull;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2018/11/19 18:58
+ */
+@ApiModel(value="急诊-历史病历列表接口传参")
+@SuppressWarnings({ "rawtypes", "serial" })
+@Getter
+@Setter
+public class HisInquirysForJzVO extends Page {
+	
+	/**
+     * 医院id
+     */
+	@ApiModelProperty(value="医院id",required=true)
+	@NotNull(message="医院id必传")
+    private Long hospitalId;
+
+    /**
+     * 科室id
+     */
+	@ApiModelProperty(value="科室id",required=true)
+	@NotNull(message="科室id必传")
+    private Long hospitalDeptId;
+    
+	/**
+	 * 开始时间
+	 */
+	@ApiModelProperty(value="开始时间，格式为：2018-11-28 17:25:30")
+	@DateTimeFormat(pattern="yyyy-MM-dd hh:mm:ss")
+	private Date startDate;
+	
+	/**
+	 * 结束时间
+	 */
+	@ApiModelProperty(value="结束时间，格式为：2018-11-28 17:25:30")
+	@DateTimeFormat(pattern="yyyy-MM-dd hh:mm:ss")
+	private Date endDate;
+	
+	@ApiModelProperty(value="是否有二次诊断,0-没有，1-有")
+	private Integer isHasSecond; 
+	   
+}

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

@@ -1,6 +1,18 @@
 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.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetEvaluationScalesDTO;
 import com.diagbot.dto.GetEvaluationsDTO;
@@ -8,31 +20,26 @@ import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.GetLastOtherDTO;
 import com.diagbot.dto.HisInquiryDTO;
 import com.diagbot.dto.HisInquirysForDjDTO;
+import com.diagbot.dto.HisInquirysForJzDTO;
 import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SaveInquiryDTO;
 import com.diagbot.facade.InquiryInfoFacade;
+import com.diagbot.vo.AddDiagnoseSecondVO;
 import com.diagbot.vo.GetEvaluationScalesVO;
 import com.diagbot.vo.GetEvaluationsVO;
 import com.diagbot.vo.GetInquiryDetailVO;
 import com.diagbot.vo.GetLastOtherVO;
 import com.diagbot.vo.HisInquirysForDjVO;
+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.validation.Valid;
-import java.util.List;
-
 /**
  * @author rengb
  * @since 2018-11-23
@@ -74,6 +81,13 @@ public class InquiryInfoController {
     public RespDTO<List<HisInquiryDTO>> hisInquirys(@Valid @RequestBody HisInquirysVO hisInquirysVO) {
         return RespDTO.onSuc(inquiryInfoFacade.hisInquirys(hisInquirysVO));
     }
+    
+    @ApiOperation(value = "急诊-历史病历列表[by:rengb]")
+    @PostMapping("/hisInquirysForJz")
+    @SysLogger("hisInquirysForJz")
+    public RespDTO<IPage<HisInquirysForJzDTO>> hisInquirysForJz(@Valid @RequestBody HisInquirysForJzVO hisInquirysForJzVO) {
+        return RespDTO.onSuc(inquiryInfoFacade.hisInquirysForJz(hisInquirysForJzVO));
+    }
 
     @ApiOperation(value = "对接-历史病历列表[by:rengb]")
     @PostMapping("/hisInquirysForDj")
@@ -103,6 +117,14 @@ public class InquiryInfoController {
     public RespDTO<List<GetEvaluationScalesDTO>> getEvaluationScales(@Valid @RequestBody GetEvaluationScalesVO getEvaluationScalesVO) {
         return RespDTO.onSuc(inquiryInfoFacade.getEvaluationScales(getEvaluationScalesVO));
     }
+    
+    @ApiOperation(value = "急诊-添加二次诊断[by:rengb]")
+    @PostMapping("/addDiagnoseSecond")
+    @SysLogger("addDiagnoseSecond")
+    public RespDTO<Boolean> addDiagnoseSecond(@Valid @RequestBody AddDiagnoseSecondVO addDiagnoseSecondVO) {
+        return RespDTO.onSuc(inquiryInfoFacade.addDiagnoseSecond(addDiagnoseSecondVO));
+    }
+    
 
 
 }

icss-service/src/main/resources/mapper/InquiryInfoMapper.xml

@@ -35,5 +35,47 @@
 		ORDER BY a.gmt_create desc
 		limit 0,1
     </select>
+    
+    <select id="hisInquirysForJz" resultType="com.diagbot.dto.HisInquirysForJzDTO">
+    	SELECT
+		a.id AS inquiryId,
+		a.hospital_dept_id AS hospitalDeptId,
+		a.doctor_id AS doctorId,
+		a.patient_id AS patientId,
+		a.inquiry_code AS inquiryCode,
+		a.gmt_modified AS inquiryDate,
+		b.modifier AS doctorIdSecond,
+		b.gmt_modified AS inquiryTimeSecond,
+		b.content_value AS diagnoseSecond
+		FROM icss_inquiry_info a
+		LEFT JOIN
+		(SELECT
+		inquiry_id,
+		gmt_modified,
+		modifier,
+		content_value
+		FROM icss_inquiry_detail
+		WHERE type=9) b
+		ON a.id=b.inquiry_id
+		WHERE 1=1
+		AND a.hospital_id=#{hospitalId}
+		AND a.hospital_dept_id=#{hospitalDeptId}
+		<if test="startDate!=null">
+			AND a.gmt_modified>=#{startDate}
+		</if>
+		<if test="endDate!=null">
+			AND #{endDate}>=a.gmt_modified
+		</if>
+		<choose>
+			<when test="isHasSecond==0">
+				AND b.inquiry_id IS NULL
+			</when>
+			<when test="isHasSecond==1">
+				AND b.inquiry_id IS NOT NULL
+			</when>
+			<otherwise></otherwise>
+		</choose>
+		ORDER BY a.gmt_modified DESC
+    </select>
 
 </mapper>

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

@@ -1,10 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.stereotype.Component;
-
 import com.diagbot.dto.LisDataDTO;
 import com.diagbot.dto.LisRetrieveDTO;
 import com.diagbot.dto.LisRetrieveListAllDTO;
@@ -18,101 +13,105 @@ import com.diagbot.vo.LisExcelWrapperVO;
 import com.diagbot.vo.LisGroupNameVO;
 import com.diagbot.vo.PacsArgumentsVO;
 import com.diagbot.vo.PacsCheckItemVO;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @Component
 public class DockingImportFacade {
 
-	public LisRetrieveListAllDTO lisDockingImport(LisArgumentsVO lisArgumentsVO) {
-		// TODO 测试数据
-		LisRetrieveListAllDTO lisRetrieveList = new LisRetrieveListAllDTO();// TODO 测试数据
-		lisRetrieveList.setAgr(24);// TODO 测试数据
-		lisRetrieveList.setName("Tom");// TODO 测试数据
-		lisRetrieveList.setPatientNum("123456");// TODO 测试数据
-		lisRetrieveList.setSex(0);// TODO 测试数据
-		lisRetrieveList.setStartTime("2019-05-01 00:00:00");// TODO 测试数据
-		lisRetrieveList.setEndTime("2019-05-31 00:00:00");// TODO 测试数据
-		List<LisRetrieveDTO> lisRetrieveDTO = new ArrayList<LisRetrieveDTO>();// TODO 测试数据
-		for (int i = 0; i < 10; i++) {// TODO 测试数据
-			LisRetrieveDTO list = new LisRetrieveDTO();
-			list.setGroupName("呼吸道病毒三联检" + i);
-			list.setInspectDoctor("admin" + i);// TODO 测试数据
-			list.setInspectTime(DateUtil.now());// TODO 测试数据
-			list.setReportTime(DateUtil.now());
-			list.setSpecimenType("血清" + i);// TODO 测试数据
-			lisRetrieveDTO.add(list);
-		}
-		lisRetrieveList.setLisRetrieveData(lisRetrieveDTO);// TODO 测试数据
+    public LisRetrieveListAllDTO lisDockingImport(LisArgumentsVO lisArgumentsVO) {
+        // TODO 测试数据
+        LisRetrieveListAllDTO lisRetrieveList = new LisRetrieveListAllDTO();// TODO 测试数据
+        lisRetrieveList.setAgr(24);// TODO 测试数据
+        lisRetrieveList.setName("Tom");// TODO 测试数据
+        lisRetrieveList.setPatientNum("123456");// TODO 测试数据
+        lisRetrieveList.setSex(0);// TODO 测试数据
+        lisRetrieveList.setStartTime("2019-05-01 00:00:00");// TODO 测试数据
+        lisRetrieveList.setEndTime("2019-05-31 00:00:00");// TODO 测试数据
+        List<LisRetrieveDTO> lisRetrieveDTO = new ArrayList<LisRetrieveDTO>();// TODO 测试数据
+        for (int i = 0; i < 10; i++) {// TODO 测试数据
+            LisRetrieveDTO list = new LisRetrieveDTO();
+            list.setGroupName("呼吸道病毒三联检" + i);
+            list.setInspectDoctor("admin" + i);// TODO 测试数据
+            list.setInspectTime(DateUtil.now());// TODO 测试数据
+            list.setReportTime(DateUtil.now());
+            list.setSpecimenType("血清" + i);// TODO 测试数据
+            lisRetrieveDTO.add(list);
+        }
+        lisRetrieveList.setLisRetrieveData(lisRetrieveDTO);// TODO 测试数据
 
-		return lisRetrieveList;// TODO 测试数据
-	}
+        return lisRetrieveList;// TODO 测试数据
+    }
 
-	public LisDataDTO getByGroupNameLisDatas(LisGroupNameVO lisGroupNameVO) {
-		// TODO 測試數據
-		LisDataDTO lisDataDTO = new LisDataDTO();// TODO 测试数据
-		lisDataDTO.setHospitalCode("121365465");// TODO 测试数据
-		lisDataDTO.setGroupName("呼吸道病毒三联检");// TODO 测试数据
-		List<LisExcelWrapperVO> lisExcelWrapper = new ArrayList<LisExcelWrapperVO>();
-		for (int i = 0; i < 10; i++) {// TODO 测试数据
-			LisExcelWrapperVO lisExcelWrapperVO = new LisExcelWrapperVO();
-			lisExcelWrapperVO.setItemName("糖代谢检查" + i);// TODO 测试数据
-			lisExcelWrapperVO.setMax("1" + i);
-			lisExcelWrapperVO.setMealName("-空腹血糖(Glu)" + i);// TODO 测试数据
-			lisExcelWrapperVO.setMin("" + i);// TODO 测试数据
-			lisExcelWrapperVO.setTime("");// TODO 测试数据
-			lisExcelWrapperVO.setType("1");// TODO 测试数据
-			lisExcelWrapperVO.setUniquemealName("-空腹血糖(Glu)" + i);
-			lisExcelWrapperVO.setUniqueName("糖代谢检查" + i);// TODO 测试数据
-			lisExcelWrapperVO.setUnit("mo/l");// TODO 测试数据
-			lisExcelWrapperVO.setValue("15" + i);// TODO 测试数据
-			lisExcelWrapper.add(lisExcelWrapperVO);// TODO 测试数据
-		}
+    public LisDataDTO getByGroupNameLisDatas(LisGroupNameVO lisGroupNameVO) {
+        // TODO 測試數據
+        LisDataDTO lisDataDTO = new LisDataDTO();// TODO 测试数据
+        lisDataDTO.setHospitalCode("121365465");// TODO 测试数据
+        lisDataDTO.setGroupName("呼吸道病毒三联检");// TODO 测试数据
+        List<LisExcelWrapperVO> lisExcelWrapper = new ArrayList<LisExcelWrapperVO>();
+        for (int i = 0; i < 10; i++) {// TODO 测试数据
+            LisExcelWrapperVO lisExcelWrapperVO = new LisExcelWrapperVO();
+            lisExcelWrapperVO.setItemName("糖代谢检查" + i);// TODO 测试数据
+            lisExcelWrapperVO.setMax("1" + i);
+            lisExcelWrapperVO.setMealName("-空腹血糖(Glu)" + i);// TODO 测试数据
+            lisExcelWrapperVO.setMin("" + i);// TODO 测试数据
+            lisExcelWrapperVO.setTime("");// TODO 测试数据
+            lisExcelWrapperVO.setType("1");// TODO 测试数据
+            lisExcelWrapperVO.setUniquemealName("-空腹血糖(Glu)" + i);
+            lisExcelWrapperVO.setUniqueName("糖代谢检查" + i);// TODO 测试数据
+            lisExcelWrapperVO.setUnit("mo/l");// TODO 测试数据
+            lisExcelWrapperVO.setValue("15" + i);// TODO 测试数据
+            lisExcelWrapper.add(lisExcelWrapperVO);// TODO 测试数据
+        }
 
-		lisDataDTO.setLisExcelWrapper(lisExcelWrapper);// TODO 测试数据
-		return lisDataDTO;// TODO 测试数据
-	}
+        lisDataDTO.setLisExcelWrapper(lisExcelWrapper);// TODO 测试数据
+        return lisDataDTO;// TODO 测试数据
+    }
 
-	public PacsRetrieveListAllDTO pacsDockingImports(PacsArgumentsVO pacsArgumentsVO) {
-		// TODO 测试数据
-		PacsRetrieveListAllDTO pacsRetrieveList = new PacsRetrieveListAllDTO();// TODO 测试数据
-		pacsRetrieveList.setAgr(24);// TODO 测试数据
-		pacsRetrieveList.setName("Tom");// TODO 测试数据
-		pacsRetrieveList.setPatientNum("123456");// TODO 测试数据
-		pacsRetrieveList.setSex(0);// TODO 测试数据
-		pacsRetrieveList.setStartTime("2019-05-01 00:00:00");// TODO 测试数据
-		pacsRetrieveList.setEndTime("2019-05-31 00:00:00");// TODO 测试数据
-		List<PacsRetrieveDTO> pacsRetrieveDTO = new ArrayList<PacsRetrieveDTO>();// TODO 测试数据
-		for (int i = 0; i < 10; i++) {// TODO 测试数据
-			PacsRetrieveDTO list = new PacsRetrieveDTO();// TODO 测试数据
-			list.setCheckItem("呼吸道病毒三联检" + i);// TODO 测试数据
-			list.setCheckNum("123456" + i);// TODO 测试数据
-			list.setName("心电图" + i);// TODO 测试数据
-			list.setInspectTime(DateUtil.now());// TODO 测试数据
-			list.setReportTime(DateUtil.now());// TODO 测试数据
-			list.setApplicationNum("8888" + i);// TODO 测试数据
-			list.setType(i);// TODO 测试数据
-			pacsRetrieveDTO.add(list);// TODO 测试数据
-		}
-		pacsRetrieveList.setPacsRetrieveData(pacsRetrieveDTO);// TODO 测试数据
-		// TODO 测试数据
-		return pacsRetrieveList;// TODO 测试数据
-	}
+    public PacsRetrieveListAllDTO pacsDockingImports(PacsArgumentsVO pacsArgumentsVO) {
+        // TODO 测试数据
+        PacsRetrieveListAllDTO pacsRetrieveList = new PacsRetrieveListAllDTO();// TODO 测试数据
+        pacsRetrieveList.setAgr(24);// TODO 测试数据
+        pacsRetrieveList.setName("Tom");// TODO 测试数据
+        pacsRetrieveList.setPatientNum("123456");// TODO 测试数据
+        pacsRetrieveList.setSex(0);// TODO 测试数据
+        pacsRetrieveList.setStartTime("2019-05-01 00:00:00");// TODO 测试数据
+        pacsRetrieveList.setEndTime("2019-05-31 00:00:00");// TODO 测试数据
+        List<PacsRetrieveDTO> pacsRetrieveDTO = new ArrayList<PacsRetrieveDTO>();// TODO 测试数据
+        for (int i = 0; i < 10; i++) {// TODO 测试数据
+            PacsRetrieveDTO list = new PacsRetrieveDTO();// TODO 测试数据
+            list.setCheckItem("呼吸道病毒三联检" + i);// TODO 测试数据
+            list.setCheckNum("123456" + i);// TODO 测试数据
+            list.setName("心电图" + i);// TODO 测试数据
+            list.setInspectTime(DateUtil.now());// TODO 测试数据
+            list.setReportTime(DateUtil.now());// TODO 测试数据
+            list.setApplicationNum("8888" + i);// TODO 测试数据
+            list.setType(i);// TODO 测试数据
+            pacsRetrieveDTO.add(list);// TODO 测试数据
+        }
+        pacsRetrieveList.setPacsRetrieveData(pacsRetrieveDTO);// TODO 测试数据
+        // TODO 测试数据
+        return pacsRetrieveList;// TODO 测试数据
+    }
 
-	public PacsDataDTO getByCheckItemPacsDatas(PacsCheckItemVO pacsGroupNameVO) {
-		// TODO 測試數據
-		PacsDataDTO pacsDataDTO = new PacsDataDTO();// TODO 测试数据
-		pacsDataDTO.setHospitalCode("121365465");// TODO 测试数据
-		pacsDataDTO.setCheckItem("心电图");// TODO 测试数据
-		List<PacsResultDTO> pacsExcelWrapper = new ArrayList<PacsResultDTO>();// TODO 测试数据
-		for (int i = 0; i < 10; i++) {// TODO 测试数据
-			PacsResultDTO pacsExcelWrapperVO = new PacsResultDTO();// TODO 测试数据
-			pacsExcelWrapperVO.setCheckItem("胸部正位" + i);// TODO 测试数据
-			pacsExcelWrapperVO.setImagingDiagnose("影像所见" + i);// TODO 测试数据
-			pacsExcelWrapperVO.setImagingResults("影像诊断" + i);// TODO 测试数据
-			pacsExcelWrapper.add(pacsExcelWrapperVO);// TODO 测试数据
-		}
+    public PacsDataDTO getByCheckItemPacsDatas(PacsCheckItemVO pacsGroupNameVO) {
+        // TODO 測試數據
+        PacsDataDTO pacsDataDTO = new PacsDataDTO();// TODO 测试数据
+        pacsDataDTO.setHospitalCode("121365465");// TODO 测试数据
+        pacsDataDTO.setCheckItem("心电图");// TODO 测试数据
+        List<PacsResultDTO> pacsExcelWrapper = new ArrayList<PacsResultDTO>();// TODO 测试数据
+        for (int i = 0; i < 10; i++) {// TODO 测试数据
+            PacsResultDTO pacsExcelWrapperVO = new PacsResultDTO();// TODO 测试数据
+            pacsExcelWrapperVO.setCheckItem("胸部正位" + i);// TODO 测试数据
+            pacsExcelWrapperVO.setImagingDiagnose("影像所见" + i);// TODO 测试数据
+            pacsExcelWrapperVO.setImagingResults("影像诊断" + i);// TODO 测试数据
+            pacsExcelWrapper.add(pacsExcelWrapperVO);// TODO 测试数据
+        }
 
-		pacsDataDTO.setPacsResultDTO(pacsExcelWrapper);// TODO 测试数据
-		return pacsDataDTO;// TODO 测试数据
-	}
+        pacsDataDTO.setPacsResultDTO(pacsExcelWrapper);// TODO 测试数据
+        return pacsDataDTO;// TODO 测试数据
+    }
 
 }

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

@@ -14,6 +14,8 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.InquiryDetailServiceImpl;
 import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.vo.AddDiagnoseSecondVO;
 import com.diagbot.vo.SaveInquiryToHisVO;
 
 /**
@@ -86,6 +88,32 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl{
 
         return true;
     }
+    
+    /**
+     * 急诊-添加二次诊断
+     * 
+     * @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);
+    }
 	
 
 

tran-service/src/main/java/com/diagbot/vo/AddDiagnoseSecondVO.java

@@ -0,0 +1,30 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rengb
+ * @time 2019年3月12日下午2:29:43
+ */
+@Getter
+@Setter
+public class AddDiagnoseSecondVO {
+	
+	/**
+	 * 问诊记录id
+	 */
+	private Long inquiryId;
+	
+    /**
+     * 医生id
+     */
+    private Long doctorId;
+	
+	/**
+	 * 二次诊断
+	 */
+	private String diagnoseSecond;
+
+}

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

@@ -1,12 +1,5 @@
 package com.diagbot.web;
 
-import java.util.List;
-
-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 com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.LisDataDTO;
 import com.diagbot.dto.LisRetrieveListAllDTO;
@@ -18,18 +11,21 @@ import com.diagbot.vo.LisArgumentsVO;
 import com.diagbot.vo.LisGroupNameVO;
 import com.diagbot.vo.PacsArgumentsVO;
 import com.diagbot.vo.PacsCheckItemVO;
-
 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;
 
 @RestController
 @RequestMapping("/lisDockingImports")
 @Api(value = "化验导入API", tags = { "化验导入API" })
 @SuppressWarnings("unchecked")
 public class DockingImportController {
-	@Autowired
-	DockingImportFacade dockingImportFacade;
-	
+    @Autowired
+    DockingImportFacade dockingImportFacade;
+
 
     @ApiOperation(value = "导入化验数据检索:[by:wangfeng]", notes = "导入化验数据检索")
     @PostMapping("/lisDockingImports")
@@ -37,25 +33,25 @@ public class DockingImportController {
     public RespDTO<LisRetrieveListAllDTO> lisDockingImports(LisArgumentsVO lisArgumentsVO) {
         return RespDTO.onSuc(dockingImportFacade.lisDockingImport(lisArgumentsVO));
     }
-    
+
     @ApiOperation(value = "根据组名称获取化验数据:[by:wangfeng]", notes = "根据组名称获取化验数据")
     @PostMapping("/getByGroupNameLisData")
     @SysLogger("getByGroupNameLisData")
     public RespDTO<LisDataDTO> getByGroupNameLisDatas(LisGroupNameVO lisGroupNameVO) {
         return RespDTO.onSuc(dockingImportFacade.getByGroupNameLisDatas(lisGroupNameVO));
-    } 
-    
+    }
+
     @ApiOperation(value = "导入辅件数据检索:[by:wangfeng]", notes = "导入辅件数据检索")
     @PostMapping("/pacsDockingImport")
     @SysLogger("pacsDockingImport")
     public RespDTO<PacsRetrieveListAllDTO> pacsDockingImports(PacsArgumentsVO pacsArgumentsVO) {
         return RespDTO.onSuc(dockingImportFacade.pacsDockingImports(pacsArgumentsVO));
     }
-    
+
     @ApiOperation(value = "根据组名称获取辅件数据:[by:wangfeng]", notes = "根据组名称获取辅件数据")
     @PostMapping("/getByCheckItemPacsData")
     @SysLogger("getByCheckItemPacsData")
     public RespDTO<PacsDataDTO> getByCheckItemPacsDatas(PacsCheckItemVO pacsGroupNameVO) {
         return RespDTO.onSuc(dockingImportFacade.getByCheckItemPacsDatas(pacsGroupNameVO));
-    } 
+    }
 }

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

@@ -47,7 +47,6 @@ public class DoctorInfoController {
                     "doctorCode: 医生编号，必填<br>")
     @PostMapping("/getDoctorInfo")
     @SysLogger("getDoctorInfo")
-    @ApiIgnore
     public RespDTO<List<DoctorInfoDTO>> getDoctorInfo(@Valid @RequestBody DoctorInfoVO doctorInfoVo) {
         List<DoctorInfoDTO> data = doctorInfoFacade.getDoctorInfo(doctorInfoVo);
         return RespDTO.onSuc(data);

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

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.InquiryInfoFacade;
+import com.diagbot.vo.AddDiagnoseSecondVO;
 import com.diagbot.vo.SaveInquiryToHisVO;
 
 import io.swagger.annotations.Api;
@@ -45,5 +46,19 @@ public class InquiryInfoController {
 	     return RespDTO.onSuc(inquiryInfoFacade.saveInquiryToHis(saveInquiryToHisVO));
 	 }
 	 
+	 /**
+	  * 急诊-添加二次诊断
+	  * @param addDiagnoseSecondVO
+	  * @return
+	  */
+	 @PostMapping("/addDiagnoseSecond")
+	 @SysLogger("addDiagnoseSecond")
+	 @Transactional
+	 @ApiIgnore
+	 public RespDTO<Boolean> addDiagnoseSecond(@RequestBody AddDiagnoseSecondVO addDiagnoseSecondVO) {
+		 return RespDTO.onSuc(inquiryInfoFacade.addDiagnoseSecond(addDiagnoseSecondVO));
+	 }
+	 
+	 
 
 }