|
@ -1515,7 +1515,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
String hosptitalCode = baseDoctorHospitalDO.getOrgCode();
|
|
String hosptitalCode = baseDoctorHospitalDO.getOrgCode();
|
|
List<DictHospitalDeptDO> dictHospitalDeptDO = dictHospitalDeptDao.findByOrgCodeAndCode(hosptitalCode,deptcode);
|
|
List<DictHospitalDeptDO> dictHospitalDeptDO = dictHospitalDeptDao.findByOrgCodeAndCode(hosptitalCode,deptcode);
|
|
if(null!=dictHospitalDeptDO&&dictHospitalDeptDO.size()>0){
|
|
if(null!=dictHospitalDeptDO&&dictHospitalDeptDO.size()>0){
|
|
deptTyepCode = dictHospitalDeptDO.get(0).getDeptTypeCode();
|
|
|
|
|
|
if (StringUtils.isNotBlank(dictHospitalDeptDO.get(0).getDeptTypeCode())){
|
|
|
|
deptTyepCode = dictHospitalDeptDO.get(0).getDeptTypeCode();
|
|
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
@ -3414,7 +3416,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
String hosptitalCode = baseDoctorHospitalDO.getOrgCode();
|
|
String hosptitalCode = baseDoctorHospitalDO.getOrgCode();
|
|
List<DictHospitalDeptDO> dictHospitalDeptDO = dictHospitalDeptDao.findByOrgCodeAndCode(hosptitalCode,deptcode);
|
|
List<DictHospitalDeptDO> dictHospitalDeptDO = dictHospitalDeptDao.findByOrgCodeAndCode(hosptitalCode,deptcode);
|
|
if(null!=dictHospitalDeptDO&&dictHospitalDeptDO.size()>0){
|
|
if(null!=dictHospitalDeptDO&&dictHospitalDeptDO.size()>0){
|
|
deptTyepCode = dictHospitalDeptDO.get(0).getDeptTypeCode();
|
|
|
|
|
|
if(StringUtils.isNotBlank(dictHospitalDeptDO.get(0).getDeptTypeCode())){
|
|
|
|
deptTyepCode = dictHospitalDeptDO.get(0).getDeptTypeCode();
|
|
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
@ -3674,9 +3678,10 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
String hosptitalCode = baseDoctorHospitalDO.getOrgCode();
|
|
String hosptitalCode = baseDoctorHospitalDO.getOrgCode();
|
|
List<DictHospitalDeptDO> dictHospitalDeptDO = dictHospitalDeptDao.findByOrgCodeAndCode(hosptitalCode,deptcode);
|
|
List<DictHospitalDeptDO> dictHospitalDeptDO = dictHospitalDeptDao.findByOrgCodeAndCode(hosptitalCode,deptcode);
|
|
if(null!=dictHospitalDeptDO&&dictHospitalDeptDO.size()>0){
|
|
if(null!=dictHospitalDeptDO&&dictHospitalDeptDO.size()>0){
|
|
deptTyepCode = dictHospitalDeptDO.get(0).getDeptTypeCode();
|
|
|
|
|
|
if(StringUtils.isNotBlank(dictHospitalDeptDO.get(0).getDeptTypeCode())){
|
|
|
|
deptTyepCode = dictHospitalDeptDO.get(0).getDeptTypeCode();
|
|
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
List<Map<String,Object>> chargeDictDOLists = new ArrayList<>();
|
|
List<Map<String,Object>> chargeDictDOLists = new ArrayList<>();
|
|
String chargeType = doctorDO.getChargeType();
|
|
String chargeType = doctorDO.getChargeType();
|
|
@ -5127,7 +5132,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
String hosptitalCode = baseDoctorHospitalDO.getOrgCode();
|
|
String hosptitalCode = baseDoctorHospitalDO.getOrgCode();
|
|
List<DictHospitalDeptDO> dictHospitalDeptDO = dictHospitalDeptDao.findByOrgCodeAndCode(hosptitalCode,deptcode);
|
|
List<DictHospitalDeptDO> dictHospitalDeptDO = dictHospitalDeptDao.findByOrgCodeAndCode(hosptitalCode,deptcode);
|
|
if(null!=dictHospitalDeptDO&&dictHospitalDeptDO.size()>0){
|
|
if(null!=dictHospitalDeptDO&&dictHospitalDeptDO.size()>0){
|
|
deptTyepCode = dictHospitalDeptDO.get(0).getDeptTypeCode();
|
|
|
|
|
|
if (StringUtils.isNotBlank(dictHospitalDeptDO.get(0).getDeptTypeCode())){
|
|
|
|
deptTyepCode = dictHospitalDeptDO.get(0).getDeptTypeCode();
|
|
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|