Merge branch 'dev' of humingfen/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/YkyyEntranceService.java

@@ -3112,7 +3112,7 @@ public class YkyyEntranceService {
        JSONObject res = new JSONObject();
        //查询是否建档
        String brid = "";
        String bridSql = "SELECT brid \"brid\" from portal_his.V_ZKSG_BRCX@xec_link where jzkh = '" +medicare + "' ";
        String bridSql = "SELECT brid \"brid\" from portal_his.V_ZKSG_BRCX@xec_link where jzkh = '" + medicare + "' ";
        Map<String, Object> params = new HashedMap();
        params.put("sql", bridSql);
        logger.info("bridSql：" + bridSql);
@@ -3121,12 +3121,12 @@ public class YkyyEntranceService {
        logger.info("response:" + content);
        JSONObject rs = JSON.parseObject(content);
        Integer status = rs.getInteger("status");
        if (status==200){
        if (status == 200) {
            JSONArray array = rs.getJSONArray("detailModelList");
            int size = array.size();
            if(size == 1){
                brid = ((JSONObject)array.get(0)).getString("BRID");
            }else if (size > 1){
            if (size == 1) {
                brid = ((JSONObject) array.get(0)).getString("BRID");
            } else if (size > 1) {
                res.put("status", -1);
                res.put("message", "该居民存在多条建档信息！");
                return res;
@@ -3149,8 +3149,7 @@ public class YkyyEntranceService {
            logger.info("params1:" + params1);
            logger.info("response1:" + content1);
            JSONObject rs1 = JSON.parseObject(content1);
            if (rs1.getInteger("status") != 200)
            {
            if (rs1.getInteger("status") != 200) {
                res.put("status", -1);
                res.put("message", "操作失败，失败原因：" + rs1.getString("message"));
                return res;
@@ -3160,12 +3159,13 @@ public class YkyyEntranceService {
                content = response.getContent();
                rs = JSON.parseObject(content);
                status = rs.getInteger("status");
                if (status==200){
                    JSONArray array = rs.getJSONArray("detailModelList");
                if (status == 200) {
                    res.put("status", 200);
                    /*JSONArray array = rs.getJSONArray("detailModelList");
                    int size = array.size();
                    if(size == 1){
                        logger.info("array:" + array.toString());
                        brid = ((JSONObject)array.get(0)).getString("BRID");
                        brid = ((JSONObject)array.get(0)).getString("brid");
                        res.put("status", 200);
                        res.put("message", brid);
                        logger.info("brid:" + brid);
@@ -3173,7 +3173,7 @@ public class YkyyEntranceService {
                        res.put("status", -1);
                        res.put("message", "该居民存在多条建档信息！");
                        return res;
                    }
                    }*/
                }
            }
        }