|
|
@ -20,11 +20,13 @@ import com.yihu.jw.entity.hospital.consult.WlyyHospitalWaitingRoomDO;
|
|
|
import com.yihu.jw.entity.hospital.message.BaseBannerDoctorDO;
|
|
|
import com.yihu.jw.entity.hospital.message.BaseUserMessageDO;
|
|
|
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
|
|
|
import com.yihu.jw.entity.hospital.prescription.WlyyConsultAdvice;
|
|
|
import com.yihu.jw.entity.hospital.prescription.WlyyOutpatientDO;
|
|
|
import com.yihu.jw.entity.order.BusinessOrderDO;
|
|
|
import com.yihu.jw.evaluate.score.dao.BaseEvaluateDao;
|
|
|
import com.yihu.jw.evaluate.score.dao.BaseEvaluateScoreDao;
|
|
|
import com.yihu.jw.hospital.consult.dao.HospitalWaitingRoomDao;
|
|
|
import com.yihu.jw.hospital.consult.dao.WlyyConsultAdviceDao;
|
|
|
import com.yihu.jw.hospital.message.dao.BaseBannerDoctorDao;
|
|
|
import com.yihu.jw.hospital.message.dao.BaseUserMessageDao;
|
|
|
import com.yihu.jw.hospital.message.service.SystemMessageService;
|
|
|
@ -49,6 +51,7 @@ import com.yihu.jw.util.common.IdCardUtil;
|
|
|
import com.yihu.jw.util.date.DateUtil;
|
|
|
import com.yihu.jw.utils.hibernate.HibenateUtils;
|
|
|
import com.yihu.jw.wechat.service.WxAccessTokenService;
|
|
|
import com.ylzinfo.onepay.sdk.utils.StringUtil;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
@ -161,6 +164,8 @@ public class ImService {
|
|
|
private BaseUserMessageDao userMessageDao;
|
|
|
@Autowired
|
|
|
private BaseDoctorHospitalDao doctorHospitalDao;
|
|
|
@Autowired
|
|
|
private WlyyConsultAdviceDao wlyyConsultAdviceDao;
|
|
|
|
|
|
@Value("${wechat.id}")
|
|
|
private String wxId;
|
|
|
@ -2269,7 +2274,20 @@ public class ImService {
|
|
|
map.put("doctorName",baseDoctorDO.getName());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if (map.get("id")!=null){
|
|
|
if("1".equals(type) || "15".equals(type) || type.contains(",")){
|
|
|
String consultCode = map.get("id").toString();
|
|
|
List<WlyyConsultAdvice> consultAdvices = wlyyConsultAdviceDao.getByConsult(consultCode);
|
|
|
StringBuffer content = new StringBuffer();
|
|
|
for (WlyyConsultAdvice consultAdvice:consultAdvices){
|
|
|
content.append(consultAdvice.getAdviceValue()+",");
|
|
|
}
|
|
|
if (content!=null){
|
|
|
content.deleteCharAt(content.length()-1);
|
|
|
}
|
|
|
map.put("icd10Name",content);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
return mapList;
|
|
|
}
|
|
|
@ -3151,8 +3169,16 @@ public class ImService {
|
|
|
|
|
|
sql =sql +" ORDER BY op.create_time DESC";
|
|
|
}
|
|
|
|
|
|
return hibenateUtils.createSQLQuery(sql);
|
|
|
|
|
|
List<Map<String,Object>> mapList = hibenateUtils.createSQLQuery(sql);
|
|
|
for (Map<String,Object> map:mapList){
|
|
|
if (map.get("patientIdcard")!=null){
|
|
|
String idcard = map.get("patientIdcard").toString();
|
|
|
Integer age =IdCardUtil.getAgeForIdcard(idcard);
|
|
|
map.put("patientAge",age);
|
|
|
}
|
|
|
}
|
|
|
return mapList;
|
|
|
}
|
|
|
|
|
|
/**
|
