|
@@ -853,7 +853,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
|
|
|
}
|
|
|
mzBlRecordMapper.insertMzBlRecord(mzBlRecord);
|
|
|
MzZyReq mzZyReq = mzPrescriptionVo.getMzZyReq();
|
|
|
- if (mzZyReq.getReqDept() != null && StringUtils.isNotBlank(mzZyReq.getReqDept())) {
|
|
|
+ if (mzZyReq!=null && mzZyReq.getReqDept() != null && StringUtils.isNotBlank(mzZyReq.getReqDept())) {
|
|
|
mzZyReqMapper.insert(mzZyReq);
|
|
|
}
|
|
|
//保存医技入库
|
|
@@ -1097,7 +1097,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
|
|
|
}
|
|
|
}
|
|
|
MzZyReq mzZyReq = mzPrescriptionVo.getMzZyReq();
|
|
|
- if (mzZyReq.getReqDept() != null && StringUtils.isNotBlank(mzZyReq.getReqDept())) {
|
|
|
+ if (mzZyReq!=null && mzZyReq.getReqDept() != null && StringUtils.isNotBlank(mzZyReq.getReqDept())) {
|
|
|
String zyReqPrescription = "收住院";
|
|
|
zyReqPrescription += " [" + zdUnitCodeService.queryDeptNameByIdInCache(mzZyReq.getReqDept());
|
|
|
if (mzZyReq.getSmallDept() != null && StringUtils.isNotBlank(mzZyReq.getSmallDept())) {
|
|
@@ -1498,7 +1498,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
|
|
|
}
|
|
|
}
|
|
|
MzZyReq mzZyReq = mzPrescriptionVo.getMzZyReq();
|
|
|
- if (mzZyReq.getReqDept() != null && StringUtils.isNotBlank(mzZyReq.getReqDept())) {
|
|
|
+ if (mzZyReq!=null && mzZyReq.getReqDept() != null && StringUtils.isNotBlank(mzZyReq.getReqDept())) {
|
|
|
//有入院证
|
|
|
mzZyReq.setDeptCode(mzPrescriptionVo.getVisitDeptCode());
|
|
|
mzZyReq.setDoctorCode(mzPrescriptionVo.getDoctorCode());
|