|  | @ -2197,7 +2197,7 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  |         String ksdm = "";
 |  |         String ksdm = "";
 | 
												
													
														
															|  |         DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(doctor);
 |  |         DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(doctor);
 | 
												
													
														
															|  |         //操作工号
 |  |         //操作工号
 | 
												
													
														
															|  |         JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard(),doctorMappingDO.getMappingCode());
 |  | 
 | 
												
													
														
															|  | 
 |  |         JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard());
 | 
												
													
														
															|  |         if(jsonArray1!=null&&jsonArray1.size()>0){
 |  |         if(jsonArray1!=null&&jsonArray1.size()>0){
 | 
												
													
														
															|  |             //获取医生信息
 |  |             //获取医生信息
 | 
												
													
														
															|  |             JSONObject json = jsonArray1.getJSONObject(0);
 |  |             JSONObject json = jsonArray1.getJSONObject(0);
 | 
												
											
												
													
														
															|  | @ -2260,11 +2260,8 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  |      * @return
 |  |      * @return
 | 
												
													
														
															|  |      * @throws Exception
 |  |      * @throws Exception
 | 
												
													
														
															|  |      */
 |  |      */
 | 
												
													
														
															|  |     public JSONArray findHisDoctor(String idcard,String code) throws Exception{
 |  | 
 | 
												
													
														
															|  | 
 |  |     public JSONArray findHisDoctor(String idcard) throws Exception{
 | 
												
													
														
															|  |         String sql ="select y.code AS \"code\",y.ygbh,y.name AS \"name\",y.expertise AS \"expertise\",y.introduce AS \"introduce\",y.mobile AS \"mobile\",y.idCard AS \"idcard\",y.jobtitlecode AS \"jobTitleCode\",y.jobTitleName AS \"jobTitleName\",y.dept AS \"dept\",y.deptName AS \"deptName\",y.ksdm as \"ksdm\" from v_Hlw_Ysxx y where y.idcard ='"+idcard+"'";
 |  |         String sql ="select y.code AS \"code\",y.ygbh,y.name AS \"name\",y.expertise AS \"expertise\",y.introduce AS \"introduce\",y.mobile AS \"mobile\",y.idCard AS \"idcard\",y.jobtitlecode AS \"jobTitleCode\",y.jobTitleName AS \"jobTitleName\",y.dept AS \"dept\",y.deptName AS \"deptName\",y.ksdm as \"ksdm\" from v_Hlw_Ysxx y where y.idcard ='"+idcard+"'";
 | 
												
													
														
															|  |         if (StringUtils.isNoneBlank(code)){
 |  | 
 | 
												
													
														
															|  |             sql +=" and code = '"+code+"' ";
 |  | 
 | 
												
													
														
															|  |         }
 |  | 
 | 
												
													
														
															|  |         JSONArray array = new JSONArray();
 |  |         JSONArray array = new JSONArray();
 | 
												
													
														
															|  |         Map<String,Object> params = new HashedMap();
 |  |         Map<String,Object> params = new HashedMap();
 | 
												
													
														
															|  |         params.put("sql",sql);
 |  |         params.put("sql",sql);
 | 
												
											
												
													
														
															|  | @ -2398,7 +2395,7 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  |         DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(doctor);
 |  |         DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(doctor);
 | 
												
													
														
															|  |         String ksdm = "";
 |  |         String ksdm = "";
 | 
												
													
														
															|  |         //操作工号
 |  |         //操作工号
 | 
												
													
														
															|  |         JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard(),doctorMappingDO.getMappingCode());
 |  | 
 | 
												
													
														
															|  | 
 |  |         JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard());
 | 
												
													
														
															|  |         if(jsonArray1!=null&&jsonArray1.size()>0){
 |  |         if(jsonArray1!=null&&jsonArray1.size()>0){
 | 
												
													
														
															|  |             //获取医生信息
 |  |             //获取医生信息
 | 
												
													
														
															|  |             JSONObject json = jsonArray1.getJSONObject(0);
 |  |             JSONObject json = jsonArray1.getJSONObject(0);
 | 
												
											
												
													
														
															|  | @ -2729,7 +2726,7 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  |         }
 |  |         }
 | 
												
													
														
															|  |         String ksdm = "";
 |  |         String ksdm = "";
 | 
												
													
														
															|  |         //操作工号
 |  |         //操作工号
 | 
												
													
														
															|  |         JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard(),doctorMappingDO.getMappingCode());
 |  | 
 | 
												
													
														
															|  | 
 |  |         JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard());
 | 
												
													
														
															|  |         if(jsonArray1!=null&&jsonArray1.size()>0){
 |  |         if(jsonArray1!=null&&jsonArray1.size()>0){
 | 
												
													
														
															|  |             //获取医生信息
 |  |             //获取医生信息
 | 
												
													
														
															|  |             JSONObject json = jsonArray1.getJSONObject(0);
 |  |             JSONObject json = jsonArray1.getJSONObject(0);
 | 
												
											
												
													
														
															|  | @ -2911,7 +2908,7 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  |                 DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(doctor);
 |  |                 DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(doctor);
 | 
												
													
														
															|  |                 String ksdm = "";
 |  |                 String ksdm = "";
 | 
												
													
														
															|  |                 //操作工号
 |  |                 //操作工号
 | 
												
													
														
															|  |                 JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard(),doctorMappingDO.getMappingCode());
 |  | 
 | 
												
													
														
															|  | 
 |  |                 JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard());
 | 
												
													
														
															|  |                 if(jsonArray1!=null&&jsonArray1.size()>0){
 |  |                 if(jsonArray1!=null&&jsonArray1.size()>0){
 | 
												
													
														
															|  |                     //获取医生信息
 |  |                     //获取医生信息
 | 
												
													
														
															|  |                     JSONObject json = jsonArray1.getJSONObject(0);
 |  |                     JSONObject json = jsonArray1.getJSONObject(0);
 | 
												
											
												
													
														
															|  | @ -3391,7 +3388,7 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |         }
 |  |         }
 | 
												
													
														
															|  |         //操作医生信息
 |  |         //操作医生信息
 | 
												
													
														
															|  |         JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard(),doctorMappingDO.getMappingCode());
 |  | 
 | 
												
													
														
															|  | 
 |  |         JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard());
 | 
												
													
														
															|  |         if(jsonArray1!=null&&jsonArray1.size()>0){
 |  |         if(jsonArray1!=null&&jsonArray1.size()>0){
 | 
												
													
														
															|  |             JSONObject json = jsonArray1.getJSONObject(0);
 |  |             JSONObject json = jsonArray1.getJSONObject(0);
 | 
												
													
														
															|  |             doctorHis=json.getString("code");
 |  |             doctorHis=json.getString("code");
 | 
												
											
												
													
														
															|  | @ -3517,7 +3514,7 @@ public class YkyyEntranceService {
 | 
												
													
														
															|  |             brid=json.getInteger("brid");
 |  |             brid=json.getInteger("brid");
 | 
												
													
														
															|  |         }
 |  |         }
 | 
												
													
														
															|  |         //操作医生信息
 |  |         //操作医生信息
 | 
												
													
														
															|  |         JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard(),doctorMappingDO.getMappingCode());
 |  | 
 | 
												
													
														
															|  | 
 |  |         JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard());
 | 
												
													
														
															|  |         if(jsonArray1!=null&&jsonArray1.size()>0){
 |  |         if(jsonArray1!=null&&jsonArray1.size()>0){
 | 
												
													
														
															|  |             JSONObject json = jsonArray1.getJSONObject(0);
 |  |             JSONObject json = jsonArray1.getJSONObject(0);
 | 
												
													
														
															|  |             doctorHis=json.getString("code");
 |  |             doctorHis=json.getString("code");
 |