|
@ -113,7 +113,7 @@ public class XzzxEntranceService{
|
|
@Autowired
|
|
@Autowired
|
|
private BasePatientDao basePatientDao;
|
|
private BasePatientDao basePatientDao;
|
|
@Autowired
|
|
@Autowired
|
|
private PrescriptionCheckDao prescriptionCheckDao;
|
|
|
|
|
|
private BaseDoctorHospitalDao baseDoctorHospitalDao;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -1523,7 +1523,7 @@ public class XzzxEntranceService{
|
|
"\" PRES_DATE=\""+patientAndDoctor.getString("CREATE_DATE")+
|
|
"\" PRES_DATE=\""+patientAndDoctor.getString("CREATE_DATE")+
|
|
"\" PRES_SEQ_ID=\""+patientAndDoctor.getString("PATIENT_PRES_ID")+
|
|
"\" PRES_SEQ_ID=\""+patientAndDoctor.getString("PATIENT_PRES_ID")+
|
|
"\" PK_ORDER_NO=\"\" COURSE=\""+wlyyPrescriptionInfoDO.getDays()+
|
|
"\" PK_ORDER_NO=\"\" COURSE=\""+wlyyPrescriptionInfoDO.getDays()+
|
|
"\" PKG_COUNT=\""+wlyyPrescriptionInfoDO.getPackQuantity()+
|
|
|
|
|
|
"\" PKG_COUNT=\""+wlyyPrescriptionInfoDO.getQuantity()+
|
|
"\" PKG_UNIT=\""+wlyyPrescriptionInfoDO.getPackUnitName()+"\" BAK_01=\"\" BAK_02=\"\" BAK_03=\""+wlyyPrescriptionInfoDO.getUnitName()+
|
|
"\" PKG_UNIT=\""+wlyyPrescriptionInfoDO.getPackUnitName()+"\" BAK_01=\"\" BAK_02=\"\" BAK_03=\""+wlyyPrescriptionInfoDO.getUnitName()+
|
|
"\" BAK_04=\""+wlyyPrescriptionInfoDO.getSpecification()+
|
|
"\" BAK_04=\""+wlyyPrescriptionInfoDO.getSpecification()+
|
|
"\" BAK_05=\""+wlyyPrescriptionInfoDO.getDrugPlace()+"\" />");
|
|
"\" BAK_05=\""+wlyyPrescriptionInfoDO.getDrugPlace()+"\" />");
|
|
@ -3371,13 +3371,16 @@ public Map checkSyncHis(String IoFlag,String PayCardNo,String NullahNumber,Strin
|
|
JSONObject jsonObject = new JSONObject();
|
|
JSONObject jsonObject = new JSONObject();
|
|
//先查询处方获得支付方式
|
|
//先查询处方获得支付方式
|
|
DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(doctor);
|
|
DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(doctor);
|
|
|
|
List<BaseDoctorHospitalDO> baseDoctorHospitalDO = baseDoctorHospitalDao.findByDoctorCode(doctor);
|
|
BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctor);
|
|
BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctor);
|
|
if (null != doctorMappingDO && null != baseDoctorDO) {
|
|
if (null != doctorMappingDO && null != baseDoctorDO) {
|
|
jsonObject.put("DOCTOR_ID", doctorMappingDO.getMappingCode());
|
|
jsonObject.put("DOCTOR_ID", doctorMappingDO.getMappingCode());
|
|
jsonObject.put("POSITION", baseDoctorDO.getJobTitleName());
|
|
jsonObject.put("POSITION", baseDoctorDO.getJobTitleName());
|
|
jsonObject.put("DOCTOR_NAME", baseDoctorDO.getName());
|
|
jsonObject.put("DOCTOR_NAME", baseDoctorDO.getName());
|
|
jsonObject.put("DEPT_CODE", baseDoctorDO.getVisitDept());
|
|
|
|
jsonObject.put("DEPT_NAME", baseDoctorDO.getVisitDeptName());
|
|
|
|
|
|
if (null!=baseDoctorHospitalDO&&baseDoctorHospitalDO.size()>0){
|
|
|
|
jsonObject.put("DEPT_CODE", baseDoctorHospitalDO.get(0).getDeptCode());
|
|
|
|
jsonObject.put("DEPT_NAME", baseDoctorHospitalDO.get(0).getDeptName());
|
|
|
|
}
|
|
}
|
|
}
|
|
PatientMappingDO patientMappingDO = patientMappingDao.findByPatient(patient);
|
|
PatientMappingDO patientMappingDO = patientMappingDao.findByPatient(patient);
|
|
BasePatientDO basePatientDO = patientDao.findById(patient);
|
|
BasePatientDO basePatientDO = patientDao.findById(patient);
|