|  | @ -462,7 +462,7 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  |                 wlyyOutpatientVO.setConDate(DateUtil.strToDate(conDate, DateUtil.YYYY_MM_DD_HH_MM_SS_));
 |  |                 wlyyOutpatientVO.setConDate(DateUtil.strToDate(conDate, DateUtil.YYYY_MM_DD_HH_MM_SS_));
 | 
												
													
														
															|  |                 wlyyOutpatientVOS.add(wlyyOutpatientVO);
 |  |                 wlyyOutpatientVOS.add(wlyyOutpatientVO);
 | 
												
													
														
															|  |                 List<WlyyInspectionVO> inspectionVOList = new ArrayList<>();
 |  |                 List<WlyyInspectionVO> inspectionVOList = new ArrayList<>();
 | 
												
													
														
															|  |                 JSONArray array = findV_ZKSG_JCCX(PAT_NO,wlyyOutpatientVO.getAdmNo());
 |  | 
 | 
												
													
														
															|  | 
 |  |                 JSONArray array = findV_ZKSG_JCCX(PAT_NO,wlyyOutpatientVO.getAdmNo(),demoFlag);
 | 
												
													
														
															|  |                 for (int j=0;j<array.size();j++){
 |  |                 for (int j=0;j<array.size();j++){
 | 
												
													
														
															|  |                     JSONObject object = array.getJSONObject(j);
 |  |                     JSONObject object = array.getJSONObject(j);
 | 
												
													
														
															|  |                     String ksdm = object.getString("ksdm");//科室代码
 |  |                     String ksdm = object.getString("ksdm");//科室代码
 | 
												
											
												
													
														
															|  | @ -568,7 +568,7 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  |      * HIS就诊患者历史查询
 |  |      * HIS就诊患者历史查询
 | 
												
													
														
															|  |      * @throws Exception
 |  |      * @throws Exception
 | 
												
													
														
															|  |      */
 |  |      */
 | 
												
													
														
															|  |     public JSONArray findV_ZKSG_JCCX(String brid,String conNo) throws Exception{
 |  | 
 | 
												
													
														
															|  | 
 |  |     public JSONArray findV_ZKSG_JCCX(String brid,String conNo,boolean demoFlag) throws Exception{
 | 
												
													
														
															|  |         String sql = "SELECT\n" +
 |  |         String sql = "SELECT\n" +
 | 
												
													
														
															|  |                 "\tz.BRID AS \"brid\",\n" +
 |  |                 "\tz.BRID AS \"brid\",\n" +
 | 
												
													
														
															|  |                 "\tz.BRXM AS \"brxm\",\n" +
 |  |                 "\tz.BRXM AS \"brxm\",\n" +
 | 
												
											
												
													
														
															|  | @ -595,17 +595,36 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  |                 "WHERE\n" +
 |  |                 "WHERE\n" +
 | 
												
													
														
															|  |                 "\tz.JZXH = '"+conNo+"'\n" +
 |  |                 "\tz.JZXH = '"+conNo+"'\n" +
 | 
												
													
														
															|  |                 "AND z.brid = '"+brid+"'";
 |  |                 "AND z.brid = '"+brid+"'";
 | 
												
													
														
															|  |         Map<String,Object> params = new HashedMap();
 |  | 
 | 
												
													
														
															|  |         params.put("sql",sql);
 |  | 
 | 
												
													
														
															|  |         HttpResponse response = HttpUtils.doGet(url,params);
 |  | 
 | 
												
													
														
															|  |         String content = response.getContent();
 |  | 
 | 
												
													
														
															|  |         logger.info("response:"+content);
 |  | 
 | 
												
													
														
															|  |         JSONObject rs = JSON.parseObject(content);
 |  | 
 | 
												
													
														
															|  |         Integer status = rs.getInteger("status");
 |  | 
 | 
												
													
														
															|  |         if(status!=null&&status == 200){
 |  | 
 | 
												
													
														
															|  |             return rs.getJSONArray("detailModelList");
 |  | 
 | 
												
													
														
															|  | 
 |  |         JSONArray jsonArray = new JSONArray();
 | 
												
													
														
															|  | 
 |  |         if (demoFlag){
 | 
												
													
														
															|  | 
 |  |             JSONObject jsonObject = new JSONObject();
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("brid","769da42e4dda41b29e73ddf2450b42c2");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("brxm","李艳秋");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("kdrq","2020-06-15");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("zxrq","2020-06-25");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("ysdm","A0502541");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("fymc","阿西莫林");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("fydj","9.99");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("fysl","2");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("fyhj","19.98");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("yblb","甲类");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("jzhx","X44515865");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("yjxh","F0551285");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("zxks","消化科");
 | 
												
													
														
															|  | 
 |  |             jsonArray.add(jsonObject);
 | 
												
													
														
															|  | 
 |  |         }else {
 | 
												
													
														
															|  | 
 |  |             Map<String,Object> params = new HashedMap();
 | 
												
													
														
															|  | 
 |  |             params.put("sql",sql);
 | 
												
													
														
															|  | 
 |  |             HttpResponse response = HttpUtils.doGet(url,params);
 | 
												
													
														
															|  | 
 |  |             String content = response.getContent();
 | 
												
													
														
															|  | 
 |  |             logger.info("response:"+content);
 | 
												
													
														
															|  | 
 |  |             JSONObject rs = JSON.parseObject(content);
 | 
												
													
														
															|  | 
 |  |             Integer status = rs.getInteger("status");
 | 
												
													
														
															|  | 
 |  |             if(status!=null&&status == 200){
 | 
												
													
														
															|  | 
 |  |                 return rs.getJSONArray("detailModelList");
 | 
												
													
														
															|  | 
 |  |             }
 | 
												
													
														
															|  |         }
 |  |         }
 | 
												
													
														
															|  |         return new JSONArray();
 |  | 
 | 
												
													
														
															|  | 
 |  |         return jsonArray;
 | 
												
													
														
															|  |     }
 |  |     }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
											
												
													
														
															|  | @ -1399,17 +1418,17 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  |         logger.info("idcard:"+sql);
 |  |         logger.info("idcard:"+sql);
 | 
												
													
														
															|  |         if (demoFlag){
 |  |         if (demoFlag){
 | 
												
													
														
															|  |             JSONObject jsonObject = new JSONObject();
 |  |             JSONObject jsonObject = new JSONObject();
 | 
												
													
														
															|  |             jsonObject.put("BRID","f6ab67115413e4bba1523d6d4c35766a");
 |  | 
 | 
												
													
														
															|  |             jsonObject.put("MZHM","0502452155");
 |  | 
 | 
												
													
														
															|  |             jsonObject.put("BRXM","诸葛青也");
 |  | 
 | 
												
													
														
															|  |             jsonObject.put("SFZH","450521199405092535");
 |  | 
 | 
												
													
														
															|  |             jsonObject.put("BRXZ","一般");
 |  | 
 | 
												
													
														
															|  |             jsonObject.put("BRXB","男");
 |  | 
 | 
												
													
														
															|  |             jsonObject.put("CSNY","1994-05-09");
 |  | 
 | 
												
													
														
															|  |             jsonObject.put("JZKH","DXM25631856");
 |  | 
 | 
												
													
														
															|  |             jsonObject.put("JDSJ","2020-06-28 15:15:35");
 |  | 
 | 
												
													
														
															|  |             jsonObject.put("GZZTMC","一般");
 |  | 
 | 
												
													
														
															|  |             jsonObject.put("LXDZ","厦门市五缘湾");
 |  | 
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("brid","f6ab67115413e4bba1523d6d4c35766a");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("mzhm","0502452155");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("brxm","诸葛青也");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("sfzh","450521199405092535");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("brxz","一般");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("brxb","男");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("csny","1994-05-09");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("jzkh","DXM25631856");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("jdsj","2020-06-28 15:15:35");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("gzztmc","一般");
 | 
												
													
														
															|  | 
 |  |             jsonObject.put("lxdz","厦门市五缘湾");
 | 
												
													
														
															|  |             array.add(jsonObject);
 |  |             array.add(jsonObject);
 | 
												
													
														
															|  |         }else  {
 |  |         }else  {
 | 
												
													
														
															|  |             HttpResponse response = HttpUtils.doGet(url,params);
 |  |             HttpResponse response = HttpUtils.doGet(url,params);
 |