|
@ -2197,7 +2197,7 @@ public class YkyyEntranceService {
|
|
|
String ksdm = "";
|
|
|
DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(doctor);
|
|
|
//操作工号
|
|
|
JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard());
|
|
|
JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard(),doctorMappingDO.getMappingCode());
|
|
|
if(jsonArray1!=null&&jsonArray1.size()>0){
|
|
|
//获取医生信息
|
|
|
JSONObject json = jsonArray1.getJSONObject(0);
|
|
@ -2260,8 +2260,11 @@ public class YkyyEntranceService {
|
|
|
* @return
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
public JSONArray findHisDoctor(String idcard) throws Exception{
|
|
|
public JSONArray findHisDoctor(String idcard,String code) 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+"'";
|
|
|
if (StringUtils.isNoneBlank(code)){
|
|
|
sql +=" and code = '"+code+"' ";
|
|
|
}
|
|
|
JSONArray array = new JSONArray();
|
|
|
Map<String,Object> params = new HashedMap();
|
|
|
params.put("sql",sql);
|
|
@ -2395,11 +2398,11 @@ public class YkyyEntranceService {
|
|
|
DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(doctor);
|
|
|
String ksdm = "";
|
|
|
//操作工号
|
|
|
JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard());
|
|
|
JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard(),doctorMappingDO.getMappingCode());
|
|
|
if(jsonArray1!=null&&jsonArray1.size()>0){
|
|
|
//获取医生信息
|
|
|
JSONObject json = jsonArray1.getJSONObject(0);
|
|
|
ksdm=json.getString("ksdm");
|
|
|
ksdm=json.getString("dept");
|
|
|
}
|
|
|
hlwGhmxDO.setSBXH(0);
|
|
|
hlwGhmxDO.setGHCS(1);
|
|
@ -2726,13 +2729,14 @@ public class YkyyEntranceService {
|
|
|
}
|
|
|
String ksdm = "";
|
|
|
//操作工号
|
|
|
JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard());
|
|
|
JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard(),doctorMappingDO.getMappingCode());
|
|
|
if(jsonArray1!=null&&jsonArray1.size()>0){
|
|
|
//获取医生信息
|
|
|
JSONObject json = jsonArray1.getJSONObject(0);
|
|
|
hlwGhmxDO.setCZGH(json.getString("YGBH"));
|
|
|
hlwGhmxDO.setKSDM(json.getString("ksdm"));
|
|
|
ksdm=json.getString("ksdm");
|
|
|
ksdm=json.getString("dept");
|
|
|
|
|
|
/* hlwGhmxDO.set*/
|
|
|
}
|
|
|
|
|
@ -2907,7 +2911,7 @@ public class YkyyEntranceService {
|
|
|
DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(doctor);
|
|
|
String ksdm = "";
|
|
|
//操作工号
|
|
|
JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard());
|
|
|
JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard(),doctorMappingDO.getMappingCode());
|
|
|
if(jsonArray1!=null&&jsonArray1.size()>0){
|
|
|
//获取医生信息
|
|
|
JSONObject json = jsonArray1.getJSONObject(0);
|
|
@ -3387,7 +3391,7 @@ public class YkyyEntranceService {
|
|
|
|
|
|
}
|
|
|
//操作医生信息
|
|
|
JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard());
|
|
|
JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard(),doctorMappingDO.getMappingCode());
|
|
|
if(jsonArray1!=null&&jsonArray1.size()>0){
|
|
|
JSONObject json = jsonArray1.getJSONObject(0);
|
|
|
doctorHis=json.getString("code");
|
|
@ -3513,7 +3517,7 @@ public class YkyyEntranceService {
|
|
|
brid=json.getInteger("brid");
|
|
|
}
|
|
|
//操作医生信息
|
|
|
JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard());
|
|
|
JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard(),doctorMappingDO.getMappingCode());
|
|
|
if(jsonArray1!=null&&jsonArray1.size()>0){
|
|
|
JSONObject json = jsonArray1.getJSONObject(0);
|
|
|
doctorHis=json.getString("code");
|