增加origin表查询

Hos-Resource-Rest/src/main/java/com/yihu/hos/resource/service/ResourceService.java

@@ -4,6 +4,7 @@ import com.yihu.ehr.dbhelper.common.DBList;
import com.yihu.ehr.dbhelper.common.MongodbQuery;
import com.yihu.ehr.dbhelper.common.QueryCondition;
import com.yihu.ehr.dbhelper.common.QueryEntity;
import com.yihu.ehr.dbhelper.mongodb.MongodbHelper;
import com.yihu.hos.resource.dao.intf.IResourceDao;
import com.yihu.hos.resource.service.intf.IResourceService;
import net.sf.json.JSONArray;
@@ -131,9 +132,12 @@ public class ResourceService implements IResourceService {
                }
            }
            DBList list = mdb.query(qe);
            JSONObject jo = JSONObject.fromObject(list);
            jo.remove("list");
            MongodbQuery mdbSecond = new MongodbQuery("origin");
            DBList listSecond = mdbSecond.query(qe);
            JSONObject jo=new JSONObject();
            jo.put("detailModelList", list.getList().toString());
            jo.put("originList",listSecond.getList().toString());
            return jo.toString();
        } catch (Exception e) {
            return "";

Hos-Resource-Rest/src/main/resources/config/dbhelper.properties

@@ -3,5 +3,5 @@ defaultUri = jdbc:mysql://192.168.1.220:3306/hos2?useUnicode=true&characterEncod
defaultUser = hos2
defaultPassword = hos2
mongodbUri=mongodb://admin:admin@192.168.1.220/?authSource=admin
mongodbUri=mongodb://hos:hos@172.19.103.42/?authSource=admin
mongodbName=hos