|
@ -42,12 +42,15 @@ import com.yihu.jw.rm.base.BaseRequestMapping;
|
|
|
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
|
|
|
import com.yihu.jw.util.common.IdCardUtil;
|
|
|
import com.yihu.jw.util.date.DateUtil;
|
|
|
import com.yihu.jw.util.http.HttpClientUtil;
|
|
|
import com.yihu.mysql.query.BaseJpaService;
|
|
|
import jxl.write.*;
|
|
|
import net.sf.json.JSONArray;
|
|
|
import net.sf.json.JSONObject;
|
|
|
import org.apache.commons.collections.map.HashedMap;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.http.NameValuePair;
|
|
|
import org.apache.http.message.BasicNameValuePair;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.jdbc.core.BeanPropertyRowMapper;
|
|
@ -670,7 +673,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
* @param dept
|
|
|
* @return
|
|
|
*/
|
|
|
public List<Map<String,Object>> findDoctorByHospitalAndDept(String orgCode,String dept,String chargeType,String doctorCode,String outpatientType,String startDate,String endDate){
|
|
|
public List<Map<String,Object>> findDoctorByHospitalAndDept(String orgCode,String dept,String chargeType,String doctorCode,String outpatientType,String startDate,String endDate,String key){
|
|
|
String sql ="SELECT " +
|
|
|
" d.id, " +
|
|
|
" d.photo, " +
|
|
@ -686,8 +689,13 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
" base_doctor d " +
|
|
|
" JOIN base_doctor_hospital h ON h.doctor_code = d.id " +
|
|
|
" WHERE " +
|
|
|
" h.dept_code = '"+dept+"' " +
|
|
|
" AND h.org_code = '"+orgCode+"'";
|
|
|
" 1=1";
|
|
|
if(StringUtils.isNotBlank(dept)){
|
|
|
sql+= " AND h.dept_code = '"+dept+"'";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(orgCode)){
|
|
|
sql+= " AND h.org_code = '"+orgCode+"'";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(chargeType)){
|
|
|
sql+=" AND d.charge_type ='"+chargeType+"'";
|
|
|
}
|
|
@ -696,6 +704,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
}else{
|
|
|
sql+=" AND d.outpatient_type is not null ";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(key)){
|
|
|
sql+=" AND (h.dept_name like '%"+key+"%' OR d.name like '%"+key+"%' OR d.expertise like '%"+key+"%') ";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(endDate)&&StringUtils.isNotBlank(startDate)){
|
|
|
sql+=" AND EXISTS ( " +
|
|
|
" SELECT " +
|
|
@ -729,7 +740,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
* @param dept
|
|
|
* @return
|
|
|
*/
|
|
|
public MixEnvelop findDoctorWithWork(String orgCode,String dept,String chargeType,String doctorCode,String outpatientType,String startDate,String endDate,Integer page,Integer size){
|
|
|
public MixEnvelop findDoctorWithWork(String orgCode,String dept,String chargeType,String doctorCode,String outpatientType,String startDate,String endDate,String key,Integer page,Integer size){
|
|
|
|
|
|
String totalSql ="SELECT " +
|
|
|
" count(1) AS total " +
|
|
@ -737,16 +748,24 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
" base_doctor d " +
|
|
|
" JOIN base_doctor_hospital h ON h.doctor_code = d.id " +
|
|
|
" WHERE " +
|
|
|
" h.dept_code = '"+dept+"' " +
|
|
|
" AND h.org_code = '"+orgCode+"'";
|
|
|
" 1=1 ";
|
|
|
if(StringUtils.isNotBlank(dept)){
|
|
|
totalSql+= " AND h.dept_code = '"+dept+"'";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(orgCode)){
|
|
|
totalSql+= " AND h.org_code = '"+orgCode+"'";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(chargeType)){
|
|
|
totalSql+=" AND d.charge_type ='"+chargeType+"'";
|
|
|
totalSql+= " AND d.charge_type ='"+chargeType+"'";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(outpatientType)){
|
|
|
totalSql+=" AND d.outpatient_type like'%"+outpatientType+"%'";
|
|
|
totalSql+= " AND d.outpatient_type like'%"+outpatientType+"%'";
|
|
|
}else{
|
|
|
totalSql+=" AND d.outpatient_type is not null ";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(key)){
|
|
|
totalSql+=" AND (h.dept_name like '%"+key+"%' OR d.name like '%"+key+"%' OR d.expertise like '%"+key+"%') ";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(endDate)&&StringUtils.isNotBlank(startDate)){
|
|
|
totalSql+=" AND EXISTS ( " +
|
|
|
" SELECT " +
|
|
@ -782,16 +801,24 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
" FROM " +
|
|
|
" base_doctor d " +
|
|
|
" JOIN base_doctor_hospital h ON h.doctor_code = d.id " +
|
|
|
" WHERE " +
|
|
|
" h.dept_code = '"+dept+"' " +
|
|
|
" AND h.org_code = '"+orgCode+"'";
|
|
|
" WHERE " +
|
|
|
" 1=1" ;
|
|
|
if(StringUtils.isNotBlank(dept)){
|
|
|
sql+= " AND h.dept_code = '"+dept+"'";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(orgCode)){
|
|
|
sql+= " AND h.org_code = '"+orgCode+"'";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(chargeType)){
|
|
|
sql+=" AND d.charge_type ='"+chargeType+"'";
|
|
|
sql+= " AND d.charge_type ='"+chargeType+"'";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(outpatientType)){
|
|
|
sql+=" AND d.outpatient_type like'%"+outpatientType+"%'";
|
|
|
sql+= " AND d.outpatient_type like'%"+outpatientType+"%'";
|
|
|
}else{
|
|
|
sql+=" AND d.outpatient_type is not null ";
|
|
|
sql+= " AND d.outpatient_type is not null ";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(key)){
|
|
|
sql+=" AND (h.dept_name like '%"+key+"%' OR d.name like '%"+key+"%' OR d.expertise like '%"+key+"%') ";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(endDate)&&StringUtils.isNotBlank(startDate)){
|
|
|
sql+=" AND EXISTS ( " +
|
|
@ -1548,7 +1575,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
return rs.size();
|
|
|
}
|
|
|
|
|
|
public Map<String,Object> findDoctorInfo(String doctor){
|
|
|
public Map<String,Object> findDoctorInfo(String doctor,String withWork){
|
|
|
BaseDoctorDO doctorDO = baseDoctorDao.findOne(doctor);
|
|
|
|
|
|
Map<String,Object> rs = new HashedMap();
|
|
@ -1601,6 +1628,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
}else{
|
|
|
rs.put("outpatientCount",0);
|
|
|
}
|
|
|
|
|
|
if(StringUtils.isNotBlank(withWork)&&"1".equals(withWork)){
|
|
|
List<WlyyDoctorWorkTimeVO> times = findDoctorWorkTime(doctor);
|
|
|
rs.put("workTime",times);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
return rs;
|
|
@ -2068,4 +2100,17 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
// public Map<String,Object> findPatientInfo(String patient){
|
|
|
//
|
|
|
// }
|
|
|
|
|
|
@Autowired
|
|
|
private HttpClientUtil httpClientUtil;
|
|
|
public String test() {
|
|
|
List<NameValuePair> params = new ArrayList<>();
|
|
|
params.add(new BasicNameValuePair("clientId", "ihealth_pa8DIRJasL"));
|
|
|
params.add(new BasicNameValuePair("clientSecret", "jkzl1h7aj39dnasyi23fnkv92"));
|
|
|
params.add(new BasicNameValuePair("code", "334e4232777e4edabea4a4334bf1997c"));
|
|
|
params.add(new BasicNameValuePair("openid","oULM4xIoqe3DwEClan_Rq-bQ4JDE"));
|
|
|
String res = null;
|
|
|
res = httpClientUtil.post("http://www.xmtyw.cn/wlyy/iHealth/userInfo", params, "UTF-8");
|
|
|
return res;
|
|
|
}
|
|
|
}
|