未知名尸体查询关联接受按事件

src/main/java/com/cc/controller/SolrController.java

@@ -8088,7 +8088,7 @@ public class SolrController {
 		Map<String, Object> map = new HashedMap();
 		List<String> fqList = new ArrayList<>();
 		//未知名尸体查询条件判断
-		String wzmstQ = "XXSC_PDBZ:0 AND -SC_SPSFTG_PDBZ:3";
+		String wzmstQ = "XXSC_PDBZ:0 AND (*:* -SC_SPSFTG_PDBZ:3 OR *:* -SC_SPSFTG_PDBZ:* OR *:* -SC_SPSFTG_PDBZ:'') AND DJSJ:[* TO 2019-03-12]";
 		if(null!=asjRyRelateVO.getSpsj() && !"".equals(asjRyRelateVO.getSpsj())){
 			if("null".equals(asjRyRelateVO.getSpsj())){
 				wzmstQ += " AND -SPSJ:*";
@@ -8323,6 +8323,12 @@ public class SolrController {
 		}
 		System.out.println(wzmstQ);
 		fqList.add(wzmstQ);
+		if(StringUtils.isNotBlank(wzmstQ)){
+			String wzmst_jsasjQ = "{!join fromIndex=TB_XW_JSASJ from=ID to=GLXX_XXZJBH}XXSC_PDBZ:0";
+			System.out.println(wzmst_jsasjQ);
+			fqList.add(wzmst_jsasjQ);
+		}
+
 
 		//关联尸体检验信息
 		String stjyQ = "";