| 
															
																@ -1113,7 +1113,7 @@ public class YkyyEntranceService { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     * @throws Exception 
															 | 
															
															 | 
															
																     * @throws Exception 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     */ 
															 | 
															
															 | 
															
																     */ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    public JSONArray fingHlwGhmx(String patient,String doctor) throws Exception{ 
															 | 
															
															 | 
															
																    public JSONArray fingHlwGhmx(String patient,String doctor) throws Exception{ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        String sql = "select v.SBXH,v.GHXH,to_char(v.ghsj,'yyyy-mm-dd hh24:mi:ss') as GHSJ from v_hlw_ghmx v where v.brid = '"+patient+"' and v.ysdm =" + 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																        String sql = "select v.SBXH,to_char(v.ghsj,'yyyy-mm-dd hh24:mi:ss') as GHSJ from v_hlw_ghmx v where v.brid = '"+patient+"' and v.ysdm =" + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                " '"+doctor+"' and v.ghsj > to_date('"+DateUtil.dateToStrLong(DateUtil.getToday())+"','yyyy-MM-dd HH24:mi:ss')"; 
															 | 
															
															 | 
															
																                " '"+doctor+"' and v.ghsj > to_date('"+DateUtil.dateToStrLong(DateUtil.getToday())+"','yyyy-MM-dd HH24:mi:ss')"; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        JSONArray array = new JSONArray(); 
															 | 
															
															 | 
															
																        JSONArray array = new JSONArray(); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        Map<String,Object> params = new HashedMap(); 
															 | 
															
															 | 
															
																        Map<String,Object> params = new HashedMap(); 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@ -1190,7 +1190,7 @@ public class YkyyEntranceService { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            JSONObject json = ja.getJSONObject(0); 
															 | 
															
															 | 
															
																            JSONObject json = ja.getJSONObject(0); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            hlwGhmxDO.setSBXH(json.getInteger("SBXH")); 
															 | 
															
															 | 
															
																            hlwGhmxDO.setSBXH(json.getInteger("SBXH")); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            hlwGhmxDO.setGHSJ(DateUtil.strToDate(json.getString("GHSJ"))); 
															 | 
															
															 | 
															
																            hlwGhmxDO.setGHSJ(DateUtil.strToDate(json.getString("GHSJ"))); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            GHXH = json.getInteger("GHXH"); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            GHXH = json.getInteger("SBXH"); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            String jsonString = JSONObject.toJSONString(hlwGhmxDO); 
															 | 
															
															 | 
															
																            String jsonString = JSONObject.toJSONString(hlwGhmxDO); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            Map<String,Object> params = new HashedMap(); 
															 | 
															
															 | 
															
																            Map<String,Object> params = new HashedMap(); 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@ -1241,6 +1241,9 @@ public class YkyyEntranceService { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            hlwYsMzJzLsDO.setKSSJ(DateUtil.strToDate(DateUtil.dateToStr(wlyyPrescriptionVO.getCreateTime(),"yyyy-MM-dd HH:mm:ss"))); 
															 | 
															
															 | 
															
																            hlwYsMzJzLsDO.setKSSJ(DateUtil.strToDate(DateUtil.dateToStr(wlyyPrescriptionVO.getCreateTime(),"yyyy-MM-dd HH:mm:ss"))); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            hlwYsMzJzLsDO.setJSSJ(DateUtil.getNight23()); 
															 | 
															
															 | 
															
																            hlwYsMzJzLsDO.setJSSJ(DateUtil.getNight23()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            hlwYsMzJzLsDO.setJZZT(9); 
															 | 
															
															 | 
															
																            hlwYsMzJzLsDO.setJZZT(9); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            hlwYsMzJzLsDO.setJZLX(3);//就诊类型 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            hlwYsMzJzLsDO.setZDMC(diagnosisDO.getName()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            hlwYsMzJzLsDO.setMQZD(diagnosisDO.getName()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            if (StringUtils.isNoneBlank(wlyyPrescriptionVO.getAdmNo())){ 
															 | 
															
															 | 
															
																            if (StringUtils.isNoneBlank(wlyyPrescriptionVO.getAdmNo())){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                hlwYsMzJzLsDO.setJZXH(Integer.parseInt(wlyyPrescriptionVO.getAdmNo())); 
															 | 
															
															 | 
															
																                hlwYsMzJzLsDO.setJZXH(Integer.parseInt(wlyyPrescriptionVO.getAdmNo())); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            } 
															 | 
															
															 | 
															
																            } 
															 |