|
|
@ -2,37 +2,28 @@ package com.yihu.jw.patient.service;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.alibaba.fastjson.serializer.SerializerFeature;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
|
|
|
import com.yihu.jw.entity.base.patient.BasePatientDO;
|
|
|
import com.yihu.jw.entity.base.patient.PatientMedicareCardDO;
|
|
|
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
|
|
|
import com.yihu.jw.entity.hospital.prescription.WlyyInspectionDO;
|
|
|
import com.yihu.jw.entity.hospital.prescription.WlyyOutpatientDO;
|
|
|
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionInfoDO;
|
|
|
import com.yihu.jw.healthCare.service.HealthCareNewService;
|
|
|
import com.yihu.jw.healthCare.service.HealthCareService;
|
|
|
import com.yihu.jw.hospital.mapping.dao.PatientMappingDao;
|
|
|
import com.yihu.jw.hospital.prescription.dao.OutpatientDao;
|
|
|
import com.yihu.jw.hospital.prescription.dao.PrescriptionDao;
|
|
|
import com.yihu.jw.hospital.prescription.dao.PrescriptionInfoDao;
|
|
|
import com.yihu.jw.hospital.prescription.dao.WlyyInspectionDao;
|
|
|
import com.yihu.jw.hospital.prescription.service.PrescriptionService;
|
|
|
import com.yihu.jw.hospital.ykyy.service.YkyyService;
|
|
|
import com.yihu.jw.patient.dao.BasePatientDao;
|
|
|
import com.yihu.jw.patient.dao.BasePatientGroupDao;
|
|
|
import com.yihu.jw.patient.dao.BasePatientGroupDictDao;
|
|
|
import com.yihu.jw.patient.util.ConstantUtils;
|
|
|
import com.yihu.jw.restmodel.base.patient.BasePatientVO;
|
|
|
import com.yihu.jw.restmodel.hospital.prescription.WlyyInspectionVO;
|
|
|
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionInfoVO;
|
|
|
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionVO;
|
|
|
import com.yihu.jw.restmodel.web.Envelop;
|
|
|
import com.yihu.jw.restmodel.web.MixEnvelop;
|
|
|
import com.yihu.jw.restmodel.web.ObjEnvelop;
|
|
|
import com.yihu.jw.restmodel.web.PageEnvelop;
|
|
|
import com.yihu.jw.rm.base.BaseRequestMapping;
|
|
|
import com.yihu.jw.rm.iot.IotRequestMapping;
|
|
|
import com.yihu.jw.sms.dao.HospitalSysDictDao;
|
|
|
import com.yihu.jw.util.common.IdCardUtil;
|
|
|
@ -40,10 +31,8 @@ import com.yihu.jw.utils.hibernate.HibenateUtils;
|
|
|
import com.yihu.mysql.query.BaseJpaService;
|
|
|
import com.yihu.utils.security.MD5;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.checkerframework.checker.units.qual.A;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.data.repository.CrudRepository;
|
|
|
@ -166,7 +155,7 @@ public class BasePatientService<T, R extends CrudRepository> extends BaseJpaServ
|
|
|
* @param sorts
|
|
|
* @return
|
|
|
*/
|
|
|
public MixEnvelop queryPatientBaseInfo(String nameOrIdcard, int page, int size, String sorts)throws Exception{
|
|
|
public MixEnvelop queryPatientBaseInfo(String nameOrIdcard,String mobile, int page, int size, String sorts)throws Exception{
|
|
|
List<Map<String, Object>> result = new ArrayList<>();
|
|
|
String sql = "SELECT\n" +
|
|
|
"\tID AS \"id\",\n" +
|
|
|
@ -189,11 +178,12 @@ public class BasePatientService<T, R extends CrudRepository> extends BaseJpaServ
|
|
|
" street_name \"streetName\"," +
|
|
|
" address AS \"address\"\n" +
|
|
|
"FROM\n" +
|
|
|
"\tbase_patient\n";
|
|
|
"\tbase_patient where 1=1 ";
|
|
|
if (StringUtils.isNotEmpty(nameOrIdcard)){
|
|
|
sql+="WHERE\n" +
|
|
|
"\tNAME LIKE '%"+nameOrIdcard+"%'\n" +
|
|
|
"OR idcard LIKE '%"+nameOrIdcard+"%'\n";
|
|
|
sql+=" and NAME LIKE '%"+nameOrIdcard+"%' OR idcard LIKE '%"+nameOrIdcard+"%' ";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(mobile)){
|
|
|
sql += " and mobile like '%"+mobile+"%' ";
|
|
|
}
|
|
|
/*sql+="ORDER BY\n" +
|
|
|
"\tcreate_time DESC"*/;
|
