|
@ -256,12 +256,12 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
|
|
|
|
|
|
// 因为要上传的是医师信息,所以针对到注册用户且无部门信息的用户数据不上传
|
|
|
String sql = "select a.id,a.name,a.idcard,a.sex,a.birthday, a.cert_no, a.prac_no\n" +
|
|
|
" ,a.mobile,b.dept_code,b.dept_name,b.doctor_duty_code\n" +
|
|
|
" ,a.mobile,b.dept_code,b.dept_name,a.job_title_code\n" +
|
|
|
" from base_doctor a\n" +
|
|
|
" ,base_doctor_hospital b\n" +
|
|
|
" where a.id = b.doctor_code\n" +
|
|
|
" and b.dept_code != '' \n" +
|
|
|
" and b.doctor_duty_code not in('4107','054','1313','1413','1415','018','1412','4105','1212','1312','4103','1315','1217','1215','3301','005',\n" +
|
|
|
" and a.job_title_code not in('4107','054','1313','1413','1415','018','1412','4105','1212','1312','4103','1315','1217','1215','3301','005',\n" +
|
|
|
"'1213','3501','017','020','058','002','1417','1214','1317','4101','4106') \n" ;
|
|
|
if(startDate.length() > 0){
|
|
|
sql = sql + " and a.update_time >= '" + startDate + "' ";
|
|
@ -279,7 +279,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
|
|
|
|
|
|
String[] dept = depToSubject(info.get("dept_code").toString());
|
|
|
// 中山医院 监管平台 职务字典强转
|
|
|
String[] dutyInfo = classToduty(info.get("doctor_duty_code").toString());
|
|
|
String[] dutyInfo = classToduty(info.get("job_title_code").toString());
|
|
|
|
|
|
JSONObject jb = new JSONObject();
|
|
|
jb.put("organ_code", orgCode);
|
|
@ -356,7 +356,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
|
|
|
"\tLeft JOIN wlyy_patient_register reg on reg.register_no = p.register_no\n" +
|
|
|
"\tLeft JOIN base_doctor d ON p.doctor = d.id\n" +
|
|
|
"\tLeft JOIN wlyy_charge_dict dic ON d.charge_type = dic.charge_type \n" +
|
|
|
"\tLeft Join base_patient patient on patient.id = p.patient\n" +
|
|
|
"\tLeft JOIN base_patient patient on patient.id = p.patient\n" +
|
|
|
"WHERE dic.dept_type_code = p.win_no\n" ;
|
|
|
|
|
|
if(startDate.length() > 0){
|