|
|
@ -8,7 +8,6 @@ import com.yihu.jw.dict.dao.DictHospitalDeptDao;
|
|
|
import com.yihu.jw.doctor.dao.BaseDoctorDao;
|
|
|
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
|
|
|
import com.yihu.jw.doctor.dao.BaseDoctorRoleDao;
|
|
|
import com.yihu.jw.entity.base.dict.DictDoctorDutyDO;
|
|
|
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
|
|
|
import com.yihu.jw.entity.base.dict.DictIcd10DO;
|
|
|
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
|
|
|
@ -47,7 +46,6 @@ import com.yihu.utils.network.HttpUtils;
|
|
|
import com.yihu.utils.security.MD5;
|
|
|
import org.apache.commons.collections.map.HashedMap;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.omg.CORBA.OBJ_ADAPTER;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@ -55,7 +53,6 @@ import org.springframework.jdbc.core.JdbcTemplate;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
/**
|
|
|
@ -259,6 +256,19 @@ public class YkyyEntranceService {
|
|
|
res = rs.getJSONArray("detailModelList").getJSONObject(0);
|
|
|
}
|
|
|
|
|
|
BasePatientDO patientDO = findPatientByMapingCode(res.getString("PATIENT_ID"));
|
|
|
JSONObject patientJson = new JSONObject();
|
|
|
if(patientDO==null){
|
|
|
patientJson.put("name","");
|
|
|
patientJson.put("sex","");
|
|
|
patientJson.put("birthday","");
|
|
|
}else {
|
|
|
patientJson.put("name",patientDO.getName());
|
|
|
patientJson.put("sex",patientDO.getSex());
|
|
|
patientJson.put("birthday",patientDO.getBirthday());
|
|
|
}
|
|
|
res.put("patient",patientJson);
|
|
|
|
|
|
//LIS 常规报告细视图
|
|
|
String detail1 = "select * from VLIS_REPORT_DETAIL where REPORT_ID = '"+REPORT_ID+"'";
|
|
|
Map<String,Object> detailParams1 = new HashedMap();
|
