最近一次其他史修改

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

@@ -160,6 +160,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         Map<String, Object> map = new HashMap<>();
         map.put("hospitalId", hospitalInfo.getId());
         map.put("patientId", patientInfo.getId());
+        map.put("sign", getLastOtherVO.getSign());
         InquiryInfo inquiryInfo = baseMapper.getPatientLast(map);
 
         if (inquiryInfo != null) {

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

@@ -16,10 +16,11 @@ import com.diagbot.entity.InquiryInfo;
 public interface InquiryInfoMapper extends BaseMapper<InquiryInfo> {
 	
 	/**
-	 * 根据医院id和病人id获取最近一条其他史不为空的病历
+	 * 根据医院id、病人id和病历类型获取最近一条其他史不为空的病历
 	 * @param map 包含两个参数 
 	 * hospitalId 医院id
 	 * patientId 病人id
+	 * sign 病历类型
 	 * @return
 	 */
 	InquiryInfo getPatientLast(Map<String,Object> map);

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

@@ -31,5 +31,11 @@ public class GetLastOtherVO {
 	@NotBlank(message="医院患者编号必填")
 	private String patientCode;
 	
+	/**
+     * 类型：0：结构化 1：文本模式
+     */
+	@ApiModelProperty(value="类型：0：结构化 1：文本模式")
+    private Integer sign = 0;
+	
 	   
 }

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

@@ -29,7 +29,7 @@
 		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 a.sign=0 and b.type=3 and a.is_deleted='N' 
+		and a.sign=#{sign} and b.type=3 and a.is_deleted='N' 
 		and b.is_deleted='N' 
 		group by a.id
 		ORDER BY a.gmt_create desc