病历回显修改

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

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

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

@@ -2,7 +2,9 @@ package com.diagbot.facade;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -11,8 +13,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.InquiryDetailDTO;
 import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.SaveInquiryDTO;
+import com.diagbot.entity.HospitalInfo;
 import com.diagbot.entity.InquiryDetail;
 import com.diagbot.entity.InquiryInfo;
+import com.diagbot.entity.PatientInfo;
 import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.ReadInquiryVO;
@@ -28,6 +32,10 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 	
 	@Autowired
 	private InquiryDetailFacade inquiryDetailFacade;
+	@Autowired
+	private HospitalInfoFacade hospitalInfoFacade;
+	@Autowired
+	private PatientInfoFacade patientInfoFacade;
 	
 	/**
 	 * 问诊记录保存
@@ -39,6 +47,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 		Date now = new Date();
 		
 		QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
+		queryWrapper.eq("is_deleted", "N");
 		queryWrapper.eq("hospital_id", saveInquiryVO.getHospitalId());
 		queryWrapper.eq("hospital_dept_id", saveInquiryVO.getHospitalDeptId());
 		queryWrapper.eq("doctor_id", saveInquiryVO.getDoctorId());
@@ -99,6 +108,18 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 	public ReadInquiryDTO readInquiry(ReadInquiryVO readInquiryVO){
 		ReadInquiryDTO readInquiryDTO = new ReadInquiryDTO();
 		
+		HospitalInfo hospitalInfo = hospitalInfoFacade.getHospitalByCode(readInquiryVO.getHospitalCode());
+		PatientInfo patientInfo = patientInfoFacade.getPatientByCode(readInquiryVO.getHospitalCode(), readInquiryVO.getPatientCode()); 
+		
+		Map<String,Object> map = new HashMap<>();
+		map.put("hospitalId", hospitalInfo.getId());
+		map.put("patientId", patientInfo.getId());
+		InquiryInfo inquiryInfo = baseMapper.getPatientLast(map);
+		
+		if(inquiryInfo!=null){
+			readInquiryDTO.setDataJson(inquiryInfo.getDataJson());
+		}
+		
 		return readInquiryDTO;
 	}
 

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

@@ -1,17 +1,20 @@
 package com.diagbot.facade;
 
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
+import com.diagbot.entity.PatientInfo;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.PatientInfoServiceImpl;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
 
 /**
  * @Description: 患者业务逻辑
@@ -44,6 +47,18 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
     	return baseMapper.getTopPatientInfo(getTopPatientInfoVO);
     }
     
-    
+    /**
+     * 通过医院编码、病人编码获取病人信息
+     * @param hospitalCode 医院编码
+     * @param patientCode 病人编码
+     * @return
+     */
+    public PatientInfo getPatientByCode(String hospitalCode,String patientCode){
+    	QueryWrapper<PatientInfo> queryWrapper = new QueryWrapper<PatientInfo>();
+    	queryWrapper.eq("is_deleted", "N");
+    	queryWrapper.eq("hospital_code", hospitalCode);
+    	queryWrapper.eq("code", patientCode);
+    	return this.getOne(queryWrapper);
+    }
     
 }

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

@@ -1,7 +1,9 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.InquiryInfo;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.InquiryInfo;
 
 /**
  * <p>
@@ -12,5 +14,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2018-11-23
  */
 public interface InquiryInfoMapper extends BaseMapper<InquiryInfo> {
-
+	
+	/**
+	 * 根据医院id和病人id获取最近一条其他史不为空的病历
+	 * @param map 包含两个参数 
+	 * hospitalId 医院id
+	 * patientId 病人id
+	 * @return
+	 */
+	InquiryInfo getPatientLast(Map<String,Object> map);
+	
 }

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

@@ -22,5 +22,17 @@
         <result column="data_json" property="dataJson" />
         <result column="remark" property="remark" />
     </resultMap>
+    
+    <select id="getPatientLast" parameterType="map" resultMap="BaseResultMap">
+    	SELECT
+		a.*
+		FROM icss_inquiry_info a JOIN icss_inquiry_detail b 
+		on a.id=b.inquiry_id
+		where a.hospital_id=#{hospitalId} and a.patient_id=#{patientId}
+		and b.type=3 and a.is_deleted='N' 
+		and b.is_deleted='N' 
+		group by a.id
+		ORDER BY a.gmt_create desc
+    </select>
 
 </mapper>