|
@@ -12,6 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import thyyxxk.webserver.config.exception.BizException;
|
|
|
import thyyxxk.webserver.config.exception.ExceptionEnum;
|
|
|
import thyyxxk.webserver.constants.Capacity;
|
|
|
+import thyyxxk.webserver.constants.sidicts.Insutype;
|
|
|
import thyyxxk.webserver.constants.sidicts.MedType;
|
|
|
import thyyxxk.webserver.constants.sidicts.PsnCertType;
|
|
|
import thyyxxk.webserver.dao.his.inpatient.PatientDao;
|
|
@@ -73,6 +74,9 @@ public class PatientService {
|
|
|
if (null == data) {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有住院号【" + inpatientNo + "】的在院业务!");
|
|
|
}
|
|
|
+ if (null == data.getAdmdvs()) {
|
|
|
+ data.setAdmdvs(dao.getPatAdmdvs(data.getInpatientNo(), data.getAdmissTimes(), data.getLedgerSn()));
|
|
|
+ }
|
|
|
if (null != data.getAdmdvs()) {
|
|
|
Integer parentRegion = dao.selectParentRegion(data.getAdmdvs());
|
|
|
if (null != parentRegion) {
|
|
@@ -218,6 +222,7 @@ public class PatientService {
|
|
|
*/
|
|
|
private void setExpenseInformation(@NotNull Patient data) {
|
|
|
data.setMedTypeName(MedType.getName(data.getMedType()));
|
|
|
+ data.setInsutypeName(Insutype.getName(data.getInsutype()));
|
|
|
data.setDutyNurseName(userCache.getEmployeeName(data.getDutyNurse()));
|
|
|
|
|
|
HuanZheFeiYong feiYongZhanBi = yiZhuLuRuDao.feiYongXinXi(data.getInpatientNo(), data.getAdmissTimes(), data.getLedgerSn());
|